From: Jan Kaluža <jkaluza@apache.org>
Date: Mon, 6 Oct 2014 05:57:02 +0000 (+0000)
Subject: event: have_idle_worker must not be cleared in every listener_thread iteration.
X-Git-Tag: 2.5.0-alpha~3804
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b98be8f6039fa1c1e1c346a7041bbf3d4b09080;p=apache

event: have_idle_worker must not be cleared in every listener_thread iteration.
Fixes bug when workers were not stopped after graceful restart (introduced in
r1605328).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1629576 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index e278cd1485..115be59b47 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1655,6 +1655,7 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy)
     apr_pool_t *tpool = apr_thread_pool_get(thd);
     apr_time_t timeout_time = 0, last_log;
     int closed = 0, listeners_disabled = 0;
+    int have_idle_worker = 0;
 
     last_log = apr_time_now();
     free(ti);
@@ -1689,7 +1690,6 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy)
         apr_interval_time_t timeout_interval;
         apr_time_t now;
         int workers_were_busy = 0;
-        int have_idle_worker = 0;
         if (listener_may_exit) {
             close_listeners(process_slot, &closed);
             if (terminate_mode == ST_UNGRACEFUL