diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-29 13:07:16 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-29 13:07:16 +0000 |
| commit | a70d086812da03f0e0cc8a88622e6298ee82af09 (patch) | |
| tree | f93c85ae64431e5dc54e4a2a895cf2f2dd36a70c /src/core/ngx_connection.c | |
| parent | dcc9205a39d6125988fb8a1fbed275fc389012f1 (diff) | |
| download | nginx-a70d086812da03f0e0cc8a88622e6298ee82af09.tar.gz nginx-a70d086812da03f0e0cc8a88622e6298ee82af09.zip | |
fix the previous commit
Diffstat (limited to 'src/core/ngx_connection.c')
| -rw-r--r-- | src/core/ngx_connection.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index c5abb7be6..2398d5161 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -801,15 +801,13 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) { ngx_uint_t level; -#if (NGX_WIN32) - - /* Winsock returns NGX_ECONNABORTED instead of NGX_ECONNRESET */ + /* Winsock may return NGX_ECONNABORTED instead of NGX_ECONNRESET */ - if (err == NGX_ECONNABORTED -#else - if (err == NGX_ECONNRESET + if ((err == NGX_ECONNRESET +#if (NGX_WIN32) + || err == NGX_ECONNABORTED #endif - && c->log_error == NGX_ERROR_IGNORE_ECONNRESET) + ) && c->log_error == NGX_ERROR_IGNORE_ECONNRESET) { return 0; } |