From cdb2935300746d5f2c0b6ee4feb07cdd2098f19c Mon Sep 17 00:00:00 2001 From: Colm MacCarthaigh Date: Wed, 24 Aug 2005 19:37:46 +0000 Subject: [PATCH] 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 --- CHANGES | 4 ++++ server/mpm/worker/worker.c | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index 4ee01b961e..16e1c8bed2 100644 --- 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 ] + *) 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 1380ee23b5..904ef4a902 100644 --- 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; -- 2.40.0