diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2002-10-14 16:54:45 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2002-10-14 16:54:45 +0200 |
| commit | 334b18b9fa27d5187d5f7113754b85dec348da56 (patch) | |
| tree | 4c69faa329f1df7c79bd5955b8b88129ff13b442 /server | |
| parent | Haven't heard any vetoes regarding this, so might as well fold it (diff) | |
| download | apache2-334b18b9fa27d5187d5f7113754b85dec348da56.tar.xz apache2-334b18b9fa27d5187d5f7113754b85dec348da56.zip | |
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
Diffstat (limited to 'server')
| -rw-r--r-- | server/mpm/winnt/child.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index 3e6c6befab..a32997e8e2 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); |