Mercurial > hg > nginx

diff src/core/ngx_file.c @ 3382:6be1f25bae90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix Win32 error messages when an temporary file replaces an existent file: *) do not rename an already renamed file *) now ngx_win32_rename_file() returns error code *) do not log failure inside ngx_win32_rename_file()
author Igor Sysoev <igor@sysoev.ru>
date Tue, 15 Dec 2009 13:47:02 +0000
parents 121fae8c673c
children a02b6d2e3bfd
line wrap: on
line diff
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -591,17 +591,7 @@ ngx_ext_rename_file(ngx_str_t *src, ngx_
 #if (NGX_WIN32)
 
     if (err == NGX_EEXIST) {
-        if (ngx_win32_rename_file(src, to, ext->log) == NGX_OK) {
-
-            if (ngx_rename_file(src->data, to->data) != NGX_FILE_ERROR) {
-                return NGX_OK;
-            }
-
-            err = ngx_errno;
-
-        } else {
-            err = 0;
-        }
+        err = ngx_win32_rename_file(src, to, ext->log);
     }
 
 #endif