Mercurial > hg > nginx

diff src/core/ngx_connection.c @ 2775:01c691e31032

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix the previous commit
author Igor Sysoev <igor@sysoev.ru>
date Wed, 29 Apr 2009 13:07:16 +0000
parents baad3036086e
children d478379e51ac
line wrap: on
line diff
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -801,15 +801,13 @@ ngx_connection_error(ngx_connection_t *c
 {
     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;
     }