From: Greg Ames <gregames@apache.org>
Date: Thu, 2 Aug 2001 21:24:14 +0000 (+0000)
Subject: fix a problem in the threaded and worker mpm's where a keepalive connection
X-Git-Tag: 2.0.23~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d38326bbb76b0022611d6f92edabcdd940838c2d;p=thirdparty%2Fapache%2Fhttpd.git

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 8cf6db30c68..76c45d4a5b6 100644
--- 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 dd685cde1cb..059c2ec4078 100644
--- 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;
 }
 
 /*****************************************************************