Mercurial > hg > nginx

changeset 3093:5795b2710eef stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r2975: handle Win32 ReadFile() EOF state in Unix way
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Sep 2009 09:54:47 +0000
parents 4f28e63e42b4
children 501fd3ae3188
files src/os/win32/ngx_files.c
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 *
     }
 
     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;
     }