You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by yl...@apache.org on 2016/12/15 23:55:12 UTC

svn commit: r1774541 - /httpd/httpd/trunk/server/mpm/event/event.c

Author: ylavic
Date: Thu Dec 15 23:55:12 2016
New Revision: 1774541

URL: http://svn.apache.org/viewvc?rev=1774541&view=rev
Log:
event: close a race condition where we might re-enable listeners while they
are already or about to be closed.


Modified:
    httpd/httpd/trunk/server/mpm/event/event.c

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1774541&r1=1774540&r2=1774541&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Thu Dec 15 23:55:12 2016
@@ -490,6 +490,9 @@ static void disable_listensocks(int proc
 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), "