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 15c19dad39fe3a2060d57ff212970ca433fde5fc..527df540907bf31b08ff1daf03ac2e5c59316f58 100644 (file)
--- 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 9f969af51c49cbe1716ac087b71b5f05ebdf6dbc..8e6f1aaaf39d5f0619bd6b82888898d303105f7a 100644 (file)
--- 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 
                   */