merge r3482:

do not set file time in ngx_copy_file() if the time is -1,
this fixes an issue when file is moved across devices
This commit is contained in:
Igor Sysoev 2010-06-07 11:48:19 +00:00
parent 584e7aefb0
commit 64a572cb8c
1 changed files with 6 additions and 4 deletions

View File

@ -762,10 +762,12 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf)
size -= n;
}
if (ngx_set_file_time(to, nfd, cf->time) != NGX_OK) {
ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
ngx_set_file_time_n " \"%s\" failed", to);
goto failed;
if (cf->time != -1) {
if (ngx_set_file_time(to, nfd, cf->time) != NGX_OK) {
ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
ngx_set_file_time_n " \"%s\" failed", to);
goto failed;
}
}
rc = NGX_OK;