From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 14 Oct 2002 14:54:45 +0000 (+0000)
Subject:   Fix for Sebastian's observation of my fat fingers.
X-Git-Tag: 2.0.44~291
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=334b18b9fa27d5187d5f7113754b85dec348da56;p=thirdparty%2Fapache%2Fhttpd.git

  Fix for Sebastian's observation of my fat fingers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97203 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 3e6c6befaba..a32997e8e24 100644
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -512,8 +512,8 @@ static void winnt_accept(void *lr_)
                       &BytesRead,
                       &context->Overlapped)) {
             rv = apr_get_netos_error();
-            if (rv == APR_FROM_OS_ERROR(WSAEINVAL) ||
-                rv == APR_FROM_OS_ERROR(WSAENOTSOCK)) {
+            if ((rv == APR_FROM_OS_ERROR(WSAEINVAL)) ||
+                (rv == APR_FROM_OS_ERROR(WSAENOTSOCK))) {
                 /* Hack alert. Occasionally, TransmitFile will not recycle the 
                  * accept socket (usually when the client disconnects early). 
                  * Get a new socket and try the call again.
@@ -525,8 +525,8 @@ static void winnt_accept(void *lr_)
                        "disconnect. Reallocate the accept socket and try again.");
                 continue;
             }
-            else if ((rv != APR_FROM_OS_ERROR(ERROR_IO_PENDING)
-                     (rv != APR_FROM_OS_ERROR(WSA_IO_PENDING)) {
+            else if ((rv != APR_FROM_OS_ERROR(ERROR_IO_PENDING)) &&
+                     (rv != APR_FROM_OS_ERROR(WSA_IO_PENDING))) {
                 ap_log_error(APLOG_MARK,APLOG_ERR, rv, ap_server_conf,
                              "winnt_accept: AcceptEx failed. Attempting to recover.");
                 closesocket(context->accept_socket);