summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2016-12-15 23:55:12 +0000
committerYann Ylavic <ylavic@apache.org>2016-12-15 23:55:12 +0000
commitaf22ceed1c754ed4169cca2c2343e63f995ba6c4 (patch)
tree21fbf7eedcf9c8f5c96642b0825cec2faa99a6ec
parentf7ff940a29b45b54c595d958d1082b92ab21c33d (diff)
downloadhttpd-af22ceed1c754ed4169cca2c2343e63f995ba6c4.tar.gz
event: close a race condition where we might re-enable listeners while they
are already or about to be closed. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1774541 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--server/mpm/event/event.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 11bb876a52..b688405901 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -490,6 +490,9 @@ static void disable_listensocks(int process_slot)
static void enable_listensocks(int process_slot)
{
int i;
+ if (listener_may_exit) {
+ return;
+ }
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00457)
"Accepting new connections again: "
"%u active conns (%u lingering/%u clogged/%u suspended), "