httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Fri, 11 Jan 2002 08:01:11 GMT
brianp      02/01/11 00:01:11

  Modified:    .        CHANGES
               server/mpm/worker worker.c
  Log:
  Fix for a segfault in the worker MPM during graceful shutdown:
  The per-transaction pools in the worker MPM can't be children of
  the listener thread's pool, because that pool may go out of scope
  while some workers are still procesing requests using the transaction
  pools.
  
  Revision  Changes    Path
  1.514     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.513
  retrieving revision 1.514
  diff -u -r1.513 -r1.514
  --- CHANGES	10 Jan 2002 08:47:20 -0000	1.513
  +++ CHANGES	11 Jan 2002 08:01:10 -0000	1.514
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.31-dev
   
  +  *) Fixed a segfault that happened during graceful shutdown (or when
  +     the httpd ran out of file descriptors) with the worker MPM [Brian Pane]
  +
     *) Split all Win32 modules [excluding the core components mod_core, 
        mod_so, mod_win32 and the winnt mpm] into individual loadable
        modules, so the administrator may individually disable the former
  
  
  
  1.60      +1 -1      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- worker.c	10 Jan 2002 00:27:59 -0000	1.59
  +++ worker.c	11 Jan 2002 08:01:11 -0000	1.60
  @@ -701,7 +701,7 @@
       got_fd:
           if (!workers_may_exit) {
               /* create a new transaction pool for each accepted socket */
  -            apr_pool_create_ex(&ptrans, tpool, NULL, APR_POOL_FNEW_ALLOCATOR);
  +            apr_pool_create_ex(&ptrans, NULL, NULL, APR_POOL_FNEW_ALLOCATOR);
               apr_pool_tag(ptrans, "transaction");
   
               rv = lr->accept_func(&csd, lr, ptrans);
  
  
  

Mime
View raw message