httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/netware mpm_netware.c
Date Mon, 14 Oct 2002 18:07:15 GMT
bnicholes    2002/10/14 11:07:15

  Modified:    server/mpm/netware mpm_netware.c
  Log:
  Switched to the APR_STATUS_IS_XXX macros
  
  Revision  Changes    Path
  1.61      +16 -15    httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- mpm_netware.c	3 Oct 2002 00:30:54 -0000	1.60
  +++ mpm_netware.c	14 Oct 2002 18:07:15 -0000	1.61
  @@ -456,7 +456,7 @@
                           quick try to pull the next request from the listen 
                           queue.  Try a few more times then return to our idle
                           listen state. */
  -                    if (APR_TO_NETOS_ERROR(stat) != WSAEWOULDBLOCK) {
  +                    if (!APR_STATUS_IS_EAGAIN(stat)) {
                           break;
                       }
   
  @@ -479,22 +479,23 @@
                   break;		/* We have a socket ready for reading */
               }
               else {
  -                switch (APR_TO_NETOS_ERROR(stat)) {
  -                    
  -                    case WSAEWOULDBLOCK:
   #ifdef DBINFO_ON
  +                if (APR_STATUS_IS_EAGAIN(stat)) {
                           would_block++;
                           retry_fail++;
  -                        break;
  +                }
  +                else
  +#else
  +                if (APR_STATUS_IS_EAGAIN(stat) ||
   #endif
  -                    case WSAECONNRESET:
  -                    case WSAETIMEDOUT:
  -                    case WSAEHOSTUNREACH:
  -                    case WSAENETUNREACH:
  -                        break;
  -    
  -                    case WSAENETDOWN:
  -                        /*
  +                    APR_STATUS_IS_ECONNRESET(stat) ||
  +                    APR_STATUS_IS_ETIMEDOUT(stat) ||
  +                    APR_STATUS_IS_EHOSTUNREACH(stat) ||
  +                    APR_STATUS_IS_ENETUNREACH(stat)) {
  +                        ;
  +                }
  +                else if (APR_STATUS_IS_ENETDOWN(stat)) {
  +                       /*
                           * When the network layer has been shut down, there
                           * is not much use in simply exiting: the parent
                           * would simply re-create us (and we'd fail again).
  @@ -511,8 +512,8 @@
                           ap_log_error(APLOG_MARK, APLOG_EMERG, stat, ap_server_conf,
                               "apr_accept: giving up.");
                           clean_child_exit(APEXIT_CHILDFATAL, my_worker_num, ptrans, bucket_alloc);
  -    
  -                    default:
  +                }
  +                else {
                           ap_log_error(APLOG_MARK, APLOG_ERR, stat, ap_server_conf,
                               "apr_accept: (client socket)");
                           clean_child_exit(1, my_worker_num, ptrans, bucket_alloc);
  
  
  

Mime
View raw message