httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Tue, 18 Dec 2001 21:33:27 GMT
trawick     01/12/18 13:33:27

  Modified:    server/mpm/worker worker.c
  Log:
  leaving the pipe-of-death in the ap_listeners list led to segfaults
  during sighup processing since the pipe-of-death listen_rec was
  allocated from a short-lived pool
  
  simply allocating the pipe-of-death listen_rec from the right pool
  isn't a complete fix since at that point we no longer get the
  proper cleanup and we're left with a file descriptor leak
  
  the simplest overall fix seems to be to keep the pipe-of-death out
  of the ap_listeners list for now
  
  Revision  Changes    Path
  1.49      +5 -0      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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- worker.c	2001/12/18 13:48:54	1.48
  +++ worker.c	2001/12/18 21:33:27	1.49
  @@ -1493,6 +1493,11 @@
           ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, ap_server_conf,
                       "SIGHUP received.  Attempting to restart");
       }
  +
  +    /* get the pipe of death out of the listen_rec list */
  +    ap_assert(ap_listeners->bind_addr == 0);
  +    ap_listeners = ap_listeners->next;
  +
       return 0;
   }
   
  
  
  

Mime
View raw message