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

diff --git a/CHANGES b/CHANGES
index a1dacc287ccb05174b2bce385c5c5425c5808f52..8f4c94be0f060ceee41f2bcfc4d7341c5effd773 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.3.14
 
+  *) prefork, worker, event: Reduce period during startup/restart where a
+     successive signal may be lost. PR 43696. [Arun Bhalla <arun shme net>]
+
   *) mod_allowmethods: Correct Merging of "reset" and do not allow an
      empty parameter list for the AllowMethods directive. [Rainer Jung]
 

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 760f25ea2d8d4208f0c71da291e90769dd053c84..90cb90afd8e798483cafc4b3958b8e0cd2e3a280 100644 (file)
--- 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 b7396b672e286da985ce2fa07e870a010d6b0bb0..da649f1bad1119b52ede37a220850494a58e9692 100644 (file)
--- 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 7380f681431239d30507c38c866c5e4a66ce9310..13eac65204c5ba398f87fda083f1bd94a2da88f9 100644 (file)
--- 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);