[patch] upstream PR 41743

22_all-pr41743-itk.patch (text/plain), 1.05 KB, created by Denis Kaganovich on 2011-12-07 18:57:39 UTC

https://issues.apache.org/bugzilla/show_bug.cgi?id=41743

--- a/server/mpm/experimental/itk/itk.c	2011-12-07 01:45:15.000000000 +0300
+++ b/server/mpm/experimental/itk/itk.c	2011-12-07 01:50:05.000000000 +0300
@@ -363,6 +363,7 @@ static void just_die(int sig)
 
 static void stop_listening(int sig)
 {
+    mpm_state = AP_MPMQ_STOPPING;
     ap_close_listeners();
 
     /* For a graceful stop, we want the child to exit when done */
@@ -383,6 +384,7 @@ static void sig_term(int sig)
          */
         return;
     }
+    mpm_state = AP_MPMQ_STOPPING;
     shutdown_pending = 1;
     is_graceful = (sig == AP_SIG_GRACEFUL_STOP);
 }
@@ -396,6 +398,7 @@ static void restart(int sig)
         /* Probably not an error - don't bother reporting it */
         return;
     }
+    mpm_state = AP_MPMQ_STOPPING;
     restart_pending = 1;
     is_graceful = (sig == AP_SIG_GRACEFUL);
 }
@@ -492,7 +495,7 @@ static int num_listensocks = 0;
 int ap_graceful_stop_signalled(void)
 {
     /* not ever called anymore... */
-    return 0;
+    return mpm_state == AP_MPMQ_STOPPING;
 }