diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 09:54:47 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 09:54:47 +0000 |
| commit | 0ac11cd241b2e075eee84f6fd3967fa2b13d9694 (patch) | |
| tree | 7099b3fe7667182151f723267b8cd80c7814540b | |
| parent | bfb2447d15e3a3a5076dda1963a27a0a2b61e88e (diff) | |
| download | nginx-0ac11cd241b2e075eee84f6fd3967fa2b13d9694.tar.gz nginx-0ac11cd241b2e075eee84f6fd3967fa2b13d9694.tar.bz2 | |
merge r2975:
handle Win32 ReadFile() EOF state in Unix way
| -rw-r--r-- | src/os/win32/ngx_files.c | 8 |
1 files changed, 7 insertions, 1 deletions
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; } |