Implement "de-listening" in the worker MPM. Fixes PR28167. Comments in CHANGES

file also cover r239710-1.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239740 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 4ee01b961e84e8a18854d2be69fb32d70b9f2ab4..16e1c8bed28bdaeeedd27403c5a1aba72f8dbc61 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 1380ee23b523ecb8f330f5ab6d2684d57eb4a07b..904ef4a9028b4bf8fd571a01dd6e0fba3be3d0b0 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -775,6 +775,7 @@ static void *listener_thread(apr_thread_t *thd, void * dummy)
         }
     }
 
+    ap_close_listeners();
     ap_queue_term(worker_queue);
     dying = 1;
     ap_scoreboard_image->parent[process_slot].quiescing = 1;