From dcc9205a39d6125988fb8a1fbed275fc389012f1 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 29 Apr 2009 11:34:58 +0000 Subject: [PATCH] Winsock uses ECONNABORTED instead of ECONNRESET --- src/core/ngx_connection.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index ed9efe754..c5abb7be6 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -801,7 +801,16 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) { 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, ngx_err_t err, char *text) if (err == 0 || err == NGX_ECONNRESET -#if !(NGX_WIN32) +#if (NGX_WIN32) + || err == NGX_ECONNABORTED +#else || err == NGX_EPIPE #endif || err == NGX_ENOTCONN