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/08/02 23:24:14 UTC
cvs commit: httpd-2.0/server/mpm/worker worker.c
gregames 01/08/02 14:24:14
Modified: server/mpm/threaded threaded.c
server/mpm/worker worker.c
Log:
fix a problem in the threaded and worker mpm's where a keepalive connection
on one thread can prevent the process from exiting.
let's rename ap_graceful_restart_signalled to something more appropriate
after the next beta.
Revision Changes Path
1.54 +4 -2 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- threaded.c 2001/07/31 06:22:32 1.53
+++ threaded.c 2001/08/02 21:24:14 1.54
@@ -436,9 +436,11 @@
*/
int ap_graceful_stop_signalled(void)
+ /* XXX this is really a bad confusing obsolete name
+ * maybe it should be ap_mpm_process_exiting?
+ */
{
- /* XXX - Does this really work? - Manoj */
- return is_graceful;
+ return workers_may_exit;
}
/*****************************************************************
1.5 +4 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- worker.c 2001/07/31 15:35:28 1.4
+++ worker.c 2001/08/02 21:24:14 1.5
@@ -444,9 +444,11 @@
*/
int ap_graceful_stop_signalled(void)
+ /* XXX this is really a bad confusing obsolete name
+ * maybe it should be ap_mpm_process_exiting?
+ */
{
- /* XXX - Does this really work? - Manoj */
- return is_graceful;
+ return workers_may_exit;
}
/*****************************************************************