diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-07-26 22:36:56 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-07-26 22:36:56 +0200 |
| commit | 344dbd4e8285220c8e53ac9320a9f63f810a802a (patch) | |
| tree | b2594370043d24b44970d4712e02e1079b019e72 /server/mpm | |
| parent | Docs for mod_allowmethods: Clarify GET and HEAD (diff) | |
| download | apache2-344dbd4e8285220c8e53ac9320a9f63f810a802a.tar.xz apache2-344dbd4e8285220c8e53ac9320a9f63f810a802a.zip | |
Reduce period during startup and restart where a successive signal may be lost
PR: 43696
Submitted by: Arun Bhalla <arun shme net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1151233 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm')
| -rw-r--r-- | server/mpm/event/event.c | 2 | ||||
| -rw-r--r-- | server/mpm/prefork/prefork.c | 2 | ||||
| -rw-r--r-- | server/mpm/worker/worker.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 760f25ea2d..90cb90afd8 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -2524,6 +2524,7 @@ static int event_run(apr_pool_t * _pconf, apr_pool_t * plog, server_rec * s) ap_scoreboard_image->global->running_generation = retained->my_generation; } + restart_pending = shutdown_pending = 0; set_signals(); /* Don't thrash... */ if (max_spare_threads < min_spare_threads + threads_per_child) @@ -2559,7 +2560,6 @@ static int event_run(apr_pool_t * _pconf, apr_pool_t * plog, server_rec * s) "Server built: %s", ap_get_server_built()); ap_log_command_line(plog, s); - restart_pending = shutdown_pending = 0; mpm_state = AP_MPMQ_RUNNING; server_main_loop(remaining_children_to_start); diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index b7396b672e..da649f1bad 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -941,6 +941,7 @@ static int prefork_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_scoreboard_image->global->running_generation = retained->my_generation; } + restart_pending = shutdown_pending = 0; set_signals(); if (one_process) { @@ -985,7 +986,6 @@ static int prefork_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) "Accept mutex: %s (default: %s)", apr_proc_mutex_name(accept_mutex), apr_proc_mutex_defname()); - restart_pending = shutdown_pending = 0; mpm_state = AP_MPMQ_RUNNING; diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 7380f68143..13eac65204 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -1761,6 +1761,7 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_scoreboard_image->global->running_generation = retained->my_generation; } + restart_pending = shutdown_pending = 0; set_signals(); /* Don't thrash... */ if (max_spare_threads < min_spare_threads + threads_per_child) @@ -1799,7 +1800,6 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) "Accept mutex: %s (default: %s)", apr_proc_mutex_name(accept_mutex), apr_proc_mutex_defname()); - restart_pending = shutdown_pending = 0; mpm_state = AP_MPMQ_RUNNING; server_main_loop(remaining_children_to_start); |