svn commit: r239740 - in /httpd/httpd/trunk: CHANGES server/mpm/worker/worker.c

[co...@apache.org]

Author: colm
Date: Wed Aug 24 12:37:46 2005
New Revision: 239740

URL: http://svn.apache.org/viewcvs?rev=239740&view=rev
Log:

Implement "de-listening" in the worker MPM. Fixes PR28167.  Comments in CHANGES
file also cover r239710-1. 


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/mpm/worker/worker.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=239740&r1=239739&r2=239740&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Aug 24 12:37:46 2005
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) prefork and worker MPM's: Prevent children from holding open listening
+     ports upon graceful restart. PR28167. 
+     [Colm MacCarthaigh, Brian Pinkerton <bp thinkpink.com>]
+
   *) Linux 2.0: remove support for threaded MPM's due to linuxthreads use
      of SIGUSR1 clashing with graceful restart signal. [Colm MacCarthaigh]
 

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=239740&r1=239739&r2=239740&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Wed Aug 24 12:37:46 2005
@@ -775,6 +775,7 @@
         }
     }
 
+    ap_close_listeners();
     ap_queue_term(worker_queue);
     dying = 1;
     ap_scoreboard_image->parent[process_slot].quiescing = 1;