From: Greg Ames <gregames@apache.org>
Date: Tue, 31 Jul 2001 03:08:42 +0000 (+0000)
Subject: threads in process which are quiescing (due to PoD or MaxRequestsPerChild)
X-Git-Tag: 2.0.23~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f699845c86b93dd6765d3cf18bf8794482b3d6f5;p=thirdparty%2Fapache%2Fhttpd.git

threads in process which are quiescing (due to PoD or MaxRequestsPerChild)
should not be counted as idle threads.  This can cause the server to stall.


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

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index 15c19dad39f..527df540907 100644
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -1009,7 +1009,7 @@ static void perform_idle_server_maintenance(void)
 	     * This depends on the ordering of SERVER_READY and SERVER_STARTING.
 	     */
 	    if (status <= SERVER_READY && status != SERVER_DEAD &&
-                    ps->generation == ap_my_generation && 
+                    !ps->quiescing &&
                  /* XXX the following shouldn't be necessary if we clean up 
                   *     properly after seg faults, but we're not yet    GLA 
                   */     
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 9f969af51c4..8e6f1aaaf39 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1057,7 +1057,7 @@ static void perform_idle_server_maintenance(void)
 	     * This depends on the ordering of SERVER_READY and SERVER_STARTING.
 	     */
 	    if (status <= SERVER_READY && status != SERVER_DEAD &&
-                    ps->generation == ap_my_generation && 
+                    !ps->quiescing &&
                  /* XXX the following shouldn't be necessary if we clean up 
                   *     properly after seg faults, but we're not yet    GLA 
                   */