Move the "GracefulShutdownTimeout" command definition into mpm_common

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

diff --git a/include/mpm_common.h b/include/mpm_common.h
index d81f6c8d4b1da4221c459cfb365de8efcb684eb9..c385fda1a5dae0d74a7c99076c4d40c53c4881db 100644 (file)
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -316,6 +316,10 @@ const char *ap_mpm_set_coredumpdir(cmd_parms *cmd, void *dummy,
 extern int ap_graceful_shutdown_timeout;
 const char *ap_mpm_set_graceful_shutdown(cmd_parms *cmd, void *dummy,
                                          const char *arg);
+#define AP_GRACFUL_SHUTDOWN_TIMEOUT_COMMAND \
+AP_INIT_TAKE1("GracefulShutdownTimeout", ap_mpm_set_graceful_shutdown, NULL, \
+              RSRC_CONF, "Maximum time in seconds to wait for child "        \
+              "processes to complete transactions during shutdown")
 #endif
 
 

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 7204f258acc01b822f1346cedcb7d43365c722fc..1198a6cb2302674521373a552e3eb388483eda70 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1465,9 +1465,7 @@ AP_INIT_TAKE1("MaxClients", set_max_clients, NULL, RSRC_CONF,
               "Maximum number of children alive at the same time"),
 AP_INIT_TAKE1("ServerLimit", set_server_limit, NULL, RSRC_CONF,
               "Maximum value of MaxClients for this run of Apache"),
-AP_INIT_TAKE1("GracefulShutdownTimeout", ap_mpm_set_graceful_shutdown, NULL, 
-              RSRC_CONF, "Time in seconds to wait for child processes to " 
-              "complete transactions during shutdown"),
+AP_GRACEFUL_SHUTDOWN_TIMEOUT_COMMAND,
 { NULL }
 };
 

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 65d986293cf93b4bc547783d150b7a9af0205227..e5819354370c2aa91ed0bbe68ea309f8d305d34b 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -2214,9 +2214,7 @@ AP_INIT_TAKE1("ServerLimit", set_server_limit, NULL, RSRC_CONF,
   "Maximum number of child processes for this run of Apache"),
 AP_INIT_TAKE1("ThreadLimit", set_thread_limit, NULL, RSRC_CONF,
   "Maximum number of worker threads per child process for this run of Apache - Upper limit for ThreadsPerChild"),
-AP_INIT_TAKE1("GracefulShutdownTimeout", ap_mpm_set_graceful_shutdown, NULL, 
-              RSRC_CONF, "Time in seconds to wait for child processes to " 
-              "complete transactions during shutdown"),
+AP_GRACFUL_SHUTDOWN_TIMEOUT_COMMAND,
 { NULL }
 };