From a70d086812da03f0e0cc8a88622e6298ee82af09 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Wed, 29 Apr 2009 13:07:16 +0000
Subject: fix the previous commit

---
 src/core/ngx_connection.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/core/ngx_connection.c')

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;
     }
-- 
cgit