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 Wed, 10 Apr 2002 17:13:32 GMT
bnicholes    02/04/10 10:13:32

  Modified:    server/mpm/netware mpm_netware.c
  Log:
  Closed up some holes where a thread could escape and exit without releasing
  the mutex.  This would leave all of the other threads deadlocked.
  
  Revision  Changes    Path
  1.46      +3 -0      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.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- mpm_netware.c	6 Apr 2002 00:03:32 -0000	1.45
  +++ mpm_netware.c	10 Apr 2002 17:13:32 -0000	1.46
  @@ -518,11 +518,13 @@
                           */
                           ap_log_error(APLOG_MARK, APLOG_EMERG, stat, ap_server_conf,
                               "apr_accept: giving up.");
  +                        apr_thread_mutex_unlock(accept_mutex);
                           clean_child_exit(APEXIT_CHILDFATAL, my_worker_num, bucket_alloc);
   
                       default:
                           ap_log_error(APLOG_MARK, APLOG_ERR, stat, ap_server_conf,
                               "apr_accept: (client socket)");
  +                        apr_thread_mutex_unlock(accept_mutex);
                           clean_child_exit(1, my_worker_num, bucket_alloc);
                   }
               }
  @@ -872,6 +874,7 @@
       for (lr = ap_listeners; lr; lr = lr->next) {
           apr_socket_close(lr->sd);
       }
  +    ap_listeners = NULL;
       return 0;
   }
   
  
  
  

Mime
View raw message