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

[j***@apache.org]

Author: jkaluza
Date: Mon Oct 6 05:57:02 2014
New Revision: 1629576

URL: http://svn.apache.org/r1629576
Log:
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).

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=1629576&r1=1629575&r2=1629576&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Mon Oct 6 05:57:02 2014
@@ -1655,6 +1655,7 @@ static void * APR_THREAD_FUNC listener_t
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_t
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