httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c
Date Wed, 11 Oct 2000 04:26:09 GMT
wrowe       00/10/10 21:26:09

  Modified:    src/modules/mpm/winnt mpm_winnt.c
  Log:
    This one is odd, it's not the patch either of us are concerned with, it's
    the logic that they started with.  If problems we never knew about just
    go away, don't blame us.
  
  Submitted by:	William Rowe
  Reviewed by:	Bill Stoddard
  
  Revision  Changes    Path
  1.103     +8 -8      apache-2.0/src/modules/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- mpm_winnt.c	2000/10/06 17:24:42	1.102
  +++ mpm_winnt.c	2000/10/11 04:26:08	1.103
  @@ -702,7 +702,7 @@
   
   	rc = select(listenmaxfd + 1, &main_fds, NULL, NULL, &tv);
   
  -        if (rc == 0 || (rc == SOCKET_ERROR && h_errno == WSAEINTR)) {
  +        if (rc == 0 || (rc == SOCKET_ERROR && APR_STATUS_IS_EINTR(apr_get_netos_error())))
{
               count_select_errors = 0;    /* reset count of errors */            
               continue;
           }
  @@ -711,12 +711,12 @@
                * select errors. This count is used to ensure we don't go into
                * a busy loop of continuous errors.
                */
  -            ap_log_error(APLOG_MARK, APLOG_INFO, h_errno, server_conf, 
  -                         "select failed with errno %d", h_errno);
  +            ap_log_error(APLOG_MARK, APLOG_INFO, apr_get_netos_error(), server_conf, 
  +                         "select failed with error %d", apr_get_netos_error());
               count_select_errors++;
               if (count_select_errors > MAX_SELECT_ERRORS) {
                   shutdown_in_progress = 1;
  -                ap_log_error(APLOG_MARK, APLOG_ERR, h_errno, server_conf,
  +                ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_netos_error(), server_conf,
                                "Too many errors in select loop. Child process exiting.");
                   break;
               }
  @@ -736,11 +736,11 @@
               if (csd == INVALID_SOCKET) {
                   csd = -1;
               }
  -        } while (csd < 0 && h_errno == WSAEINTR);
  +        } while (csd < 0 && APR_STATUS_IS_EINTR(apr_get_netos_error()));
   
   	if (csd < 0) {
  -            if (h_errno != WSAECONNABORTED) {
  -		ap_log_error(APLOG_MARK, APLOG_ERR, h_errno, server_conf,
  +            if (apr_get_netos_error() == APR_FROM_OS_ERROR(WSAECONNABORTED)) {
  +		ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_netos_error(), server_conf,
   			    "accept: (client socket)");
               }
   	}
  @@ -1615,7 +1615,7 @@
                        "Parent: Duplicating socket %d and sending it to child process %d",
nsd, pi.dwProcessId);
           if (WSADuplicateSocket(nsd, pi.dwProcessId,
                                  lpWSAProtocolInfo) == SOCKET_ERROR) {
  -            ap_log_error(APLOG_MARK, APLOG_CRIT, h_errno, server_conf,
  +            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), server_conf,
                            "Parent: WSADuplicateSocket failed for socket %d.", lr->sd
);
               return -1;
           }
  
  
  

Mime
View raw message