# HG changeset patch # User Igor Sysoev # Date 1241004898 0 # Node ID baad3036086e4faf4f05f2fda5cdf70500bab912 # Parent 7a44b1932741178cbfb40f73202b3137955fe496 Winsock uses ECONNABORTED instead of ECONNRESET diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -801,7 +801,16 @@ ngx_connection_error(ngx_connection_t *c { ngx_uint_t level; - if (err == NGX_ECONNRESET && c->log_error == NGX_ERROR_IGNORE_ECONNRESET) { +#if (NGX_WIN32) + + /* Winsock returns NGX_ECONNABORTED instead of NGX_ECONNRESET */ + + if (err == NGX_ECONNABORTED +#else + if (err == NGX_ECONNRESET +#endif + && c->log_error == NGX_ERROR_IGNORE_ECONNRESET) + { return 0; } @@ -813,7 +822,9 @@ ngx_connection_error(ngx_connection_t *c if (err == 0 || err == NGX_ECONNRESET -#if !(NGX_WIN32) +#if (NGX_WIN32) + || err == NGX_ECONNABORTED +#else || err == NGX_EPIPE #endif || err == NGX_ENOTCONN