From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 7 Sep 2009 09:54:47 +0000 (+0000)
Subject: merge r2975:
X-Git-Tag: release-0.7.62~10
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=0ac11cd241b2e075eee84f6fd3967fa2b13d9694;p=nginx.git

merge r2975:

handle Win32 ReadFile() EOF state in Unix way
---

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index b6f9bb645..c74ec5886 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -95,7 +95,13 @@ ngx_read_file(ngx_file_t *file, u_char *buf, size_t size, off_t offset)
     }
 
     if (ReadFile(file->fd, buf, size, &n, povlp) == 0) {
-        ngx_log_error(NGX_LOG_ERR, file->log, ngx_errno, "ReadFile() failed");
+        err = ngx_errno;
+
+        if (err == ERROR_HANDLE_EOF) {
+            return 0;
+        }
+
+        ngx_log_error(NGX_LOG_ERR, file->log, err, "ReadFile() failed");
         return NGX_ERROR;
     }