Commit 48ef3022 authored by Greg Ames's avatar Greg Ames
Browse files

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
parent caa93157

server/mpm/threaded/threaded.c

+1 −1
Original line number Diff line number Diff line
@@ -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 

                  */

server/mpm/worker/worker.c

+1 −1
Original line number Diff line number Diff line
@@ -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 

                  */