Commit f09a05ce authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files 

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
parent 0599ddd8

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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]















































server/mpm/worker/worker.c



+1
−0






























Original line number
Diff line number
Diff line








@@ -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;