From 44be39475c29e2866f1a2bcd8775ec5e489d1813 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 15 Dec 2009 13:47:02 +0000
Subject: 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()
---
 src/core/ngx_file.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'src/core/ngx_file.c')

diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 54adf3485..9c8275b9b 100644
--- 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_str_t *to, ngx_ext_rename_file_t *ext)
 #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
-- 
cgit