ap_start_shutdown is not used by anybody outside of the MPMs, so we don't

need to put it in the ap_mpm.h header file.  This also makes all of the
instances of ap_start_shutdown static.

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

diff --git a/include/ap_mpm.h b/include/ap_mpm.h
index 491eb6370f70fd04ccb2ec829bf193debbccb914..1e1914b21c64e5e12825f6dce0a96cfd677abda7 100644 (file)
--- a/include/ap_mpm.h
+++ b/include/ap_mpm.h
@@ -125,22 +125,6 @@ AP_DECLARE(int) ap_mpm_run(apr_pool_t *pconf, apr_pool_t *plog, server_rec *serv
  */
 AP_DECLARE(int) ap_graceful_stop_signalled(void);
 
-/**
- * ap_start_shutdown() and ap_start_restart() is a function to initiate 
- * shutdown without relying on signals. 
- *
- * This should only be called from the parent process itself, since the
- * parent process will use the shutdown_pending and restart_pending variables
- * to determine whether to shutdown or restart. The child process should
- * call signal_parent() directly to tell the parent to die -- this will
- * cause neither of those variable to be set, which the parent will
- * assume means something serious is wrong (which it will be, for the
- * child to force an exit) and so do an exit anyway.
- * @deffunc void ap_start_shutdown(void)
- */
-
-AP_DECLARE(void) ap_start_shutdown(void);
-
 /**
  * Spawn a process with privileges that another module has requested
  * @param r The request_rec of the current request

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 495eb5b3e251891299dcba4b96425dc1c516e973..d9e3037734222fe6709f9d93b353b3423ca7388b 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -197,7 +197,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
        /* Um, is this _probably_ not an error, if the user has

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 9f63a44d19392d9f3fd048cb124461e4ebd3fd28..21de8db305c220189d1ad95287b98dae04a1471b 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -234,7 +234,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
        /* Um, is this _probably_ not an error, if the user has

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 286430e59c74c99acafa7f29b0f7828b443c1f32..cdce784c458ff8e34d063d5dd850a4138de670f6 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -272,7 +272,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
        /* Um, is this _probably_ not an error, if the user has

diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index 3f62b40e7d7aa4b312b52f8b86d37e47234d01ab..3f907c2bd4a6150b5c081c3e6afe3783805d6e26 100644 (file)
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -203,7 +203,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
        /* Um, is this _probably_ not an error, if the user has

diff --git a/server/mpm/mpmt_pthread/mpmt_pthread.c b/server/mpm/mpmt_pthread/mpmt_pthread.c
index e43440c993882e85dca56f7f31350af0789420ec..56a6bec9a15cdbd6131c3d0eb17695ed9f92bd1e 100644 (file)
--- a/server/mpm/mpmt_pthread/mpmt_pthread.c
+++ b/server/mpm/mpmt_pthread/mpmt_pthread.c
@@ -231,7 +231,7 @@ ap_generation_t volatile ap_my_generation;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
        /* Um, is this _probably_ not an error, if the user has

diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index 286430e59c74c99acafa7f29b0f7828b443c1f32..cdce784c458ff8e34d063d5dd850a4138de670f6 100644 (file)
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -272,7 +272,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
        /* Um, is this _probably_ not an error, if the user has