ap_mpm_graceful_stop -> ap_graceful_stop_signalled

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

diff --git a/include/ap_mpm.h b/include/ap_mpm.h
index ddd3e086c82a7d8cf0bf0498064f19274f79131d..bd3b7a655f2274087953848b1f58f7677a35c8be 100644 (file)
--- a/include/ap_mpm.h
+++ b/include/ap_mpm.h
@@ -112,7 +112,7 @@ API_EXPORT(int) ap_mpm_run(pool *pconf, pool *plog, server_rec *server_conf);
 
 /* predicate indicating if a graceful stop has been requested ...
    used by the connection loop */
-API_EXPORT(int) ap_mpm_graceful_stop(void);
+API_EXPORT(int) ap_graceful_stop_signalled(void);
 
 /* a mutex which synchronizes threads within one process */
 typedef struct ap_thread_mutex ap_thread_mutex;

diff --git a/server/connection.c b/server/connection.c
index 4cdfbcf5e0fe3faea27ce152ac9d8c865a8d9889..2ee7680f90cf8b09359d2a0393f734347501482a 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -206,7 +206,7 @@ CORE_EXPORT(void) ap_process_connection(conn_rec *c)
 
        ap_destroy_pool(r->pool);
 
-       if (ap_mpm_graceful_stop()) {
+       if (ap_graceful_stop_signalled()) {
            /* XXX: hey wait, this should do a lingering_close! */
            ap_bclose(c->client);
            return;