You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gr...@apache.org on 2001/07/31 05:08:42 UTC
cvs commit: httpd-2.0/server/mpm/worker worker.c
gregames 01/07/30 20:08:42
Modified: server/mpm/threaded threaded.c
server/mpm/worker worker.c
Log:
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.
Revision Changes Path
1.52 +1 -1 httpd-2.0/server/mpm/threaded/threaded.c
Index: threaded.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- threaded.c 2001/07/28 23:39:07 1.51
+++ threaded.c 2001/07/31 03:08:42 1.52
@@ -1009,7 +1009,7 @@
* 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
*/
1.2 +1 -1 httpd-2.0/server/mpm/worker/worker.c
Index: worker.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- worker.c 2001/07/30 05:02:53 1.1
+++ worker.c 2001/07/31 03:08:42 1.2
@@ -1057,7 +1057,7 @@
* 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
*/