httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt child.c
Date Mon, 14 Oct 2002 14:54:45 GMT
wrowe       2002/10/14 07:54:45

  Modified:    server/mpm/winnt child.c
  Log:
    Fix for Sebastian's observation of my fat fingers.
  
  Revision  Changes    Path
  1.9       +4 -4      httpd-2.0/server/mpm/winnt/child.c
  
  Index: child.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/child.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- child.c	14 Oct 2002 03:13:20 -0000	1.8
  +++ child.c	14 Oct 2002 14:54:45 -0000	1.9
  @@ -512,8 +512,8 @@
                         &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 @@
                          "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);
  
  
  

Mime
View raw message