Commit 3fe110f8 authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files 

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
parent 251a1b13

include/mpm_common.h

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

server/mpm/prefork/prefork.c

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

};

server/mpm/worker/worker.c

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

};