mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-22 22:10:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge r3482:

Browse Source 
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 0625f491f4
commit 6b2bcfcd0d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/ngx_file.c
View File

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