Winsock uses ECONNABORTED instead of ECONNRESET

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index ed9efe754a450384b9531ee457813637a91fa421..c5abb7be6ce21088af85b4bcb7d2c4dbf0b88521 100644 (file)
--- 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