diff options
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; } |