From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 15 Dec 2016 23:55:12 +0000 (+0000)
Subject: event: close a race condition where we might re-enable listeners while they
X-Git-Tag: 2.5.0-alpha~899
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af22ceed1c754ed4169cca2c2343e63f995ba6c4;p=apache

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

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), "