Mercurial > hg > nginx

diff src/core/ngx_file.c @ 6468:a5897d360977

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32: additional error code NGX_EEXIST_FILE (ticket #910). On Windows there are two possible error codes which correspond to the EEXIST error code: ERROR_FILE_EXISTS used by CreateFile(CREATE_NEW), and ERROR_ALREADY_EXISTS used by CreateDirectory(). MoveFile() seems to use both: ERROR_ALREADY_EXISTS when moving within one filesystem, and ERROR_FILE_EXISTS when copying a file to a different drive.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 29 Mar 2016 09:51:46 +0300
parents 6e10518f95d8
children 2cd019520210
line wrap: on
line diff
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -196,7 +196,7 @@ ngx_create_temp_file(ngx_file_t *file, n
 
         err = ngx_errno;
 
-        if (err == NGX_EEXIST) {
+        if (err == NGX_EEXIST_FILE) {
             n = (uint32_t) ngx_next_temp_number(1);
             continue;
         }
@@ -692,7 +692,7 @@ ngx_ext_rename_file(ngx_str_t *src, ngx_
 
 #if (NGX_WIN32)
 
-    if (err == NGX_EEXIST) {
+    if (err == NGX_EEXIST || err == NGX_EEXIST_FILE) {
         err = ngx_win32_rename_file(src, to, ext->log);
 
         if (err == 0) {