use ngx_ext_rename_file() for single file MOVE
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 28980df..fdefacf 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c
@@ -487,11 +487,13 @@ #if !(NGX_WIN32) - if (ngx_change_file_access(src->data, ext->access) == NGX_FILE_ERROR) { - ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno, - ngx_change_file_access_n " \"%s\" failed", src->data); - err = 0; - goto failed; + if (ext->access) { + if (ngx_change_file_access(src->data, ext->access) == NGX_FILE_ERROR) { + ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno, + ngx_change_file_access_n " \"%s\" failed", src->data); + err = 0; + goto failed; + } } #endif @@ -517,7 +519,7 @@ goto failed; } - err = ngx_create_full_path(to->data, ngx_dir_access(ext->access)); + err = ngx_create_full_path(to->data, ngx_dir_access(ext->path_access)); if (err) { ngx_log_error(NGX_LOG_CRIT, ext->log, err, @@ -561,12 +563,14 @@ } } - if (err) { + if (err && ext->log_rename_error) { ngx_log_error(NGX_LOG_CRIT, ext->log, err, ngx_rename_file_n " \"%s\" to \"%s\" failed", src->data, to->data); } + ext->rename_error = err; + return NGX_ERROR; }
diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h index 8e08398..344da09 100644 --- a/src/core/ngx_file.h +++ b/src/core/ngx_file.h
@@ -60,11 +60,14 @@ typedef struct { ngx_uint_t access; + ngx_uint_t path_access; time_t time; ngx_fd_t fd; + ngx_err_t rename_error; unsigned create_path:1; unsigned delete_file:1; + unsigned log_rename_error:1; ngx_log_t *log; } ngx_ext_rename_file_t;