Commit 9c509487 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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
parent c9c8ffef

include/ap_mpm.h

+0 −16
Original line number Diff line number Diff line
@@ -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

server/mpm/beos/beos.c

+1 −1
Original line number Diff line number Diff line
@@ -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

server/mpm/dexter/dexter.c

+1 −1
Original line number Diff line number Diff line
@@ -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

server/mpm/experimental/perchild/perchild.c

+1 −1
Original line number Diff line number Diff line
@@ -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

server/mpm/mpmt_beos/mpmt_beos.c

+1 −1
Original line number Diff line number Diff line
@@ -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