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.

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

diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c
index 8cf6db30c68b119c87344610da29a4b735e31443..76c45d4a5b688f84b6350c9a488dc57885a7ee25 100644 (file)
--- a/server/mpm/threaded/threaded.c
+++ b/server/mpm/threaded/threaded.c
@@ -436,9 +436,11 @@ static void set_signals(void)
  */
 
 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;
 }
 
 /*****************************************************************

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index dd685cde1cb47a1b13cb92a6f714491ed2bd5dd6..059c2ec40788d313cebb2d4c0b178da947d8bad3 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -444,9 +444,11 @@ static void set_signals(void)
  */
 
 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;
 }
 
 /*****************************************************************