Commit 9ae1372e authored by Joe Orton's avatar Joe Orton
Browse files

* server/mpm/prefork/prefork.c (stop_listening, sig_term, restart): 

  Update mpm_state in the signal handlers such that it is correct in
  children during a graceful stop/restart too.

PR: 41743
Submitted by: Andrew Punch <andrew.punch 247realmedia.com>


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.3.11



  *) prefork: Update MPM state in children during a graceful stop or

     restart.  PR 41743.  [Andrew Punch <andrew.punch 247realmedia.com>]



  *) mod_mime: Ignore leading dots when looking for mime extensions.

     PR 50434 [Stefan Fritsch]

server/mpm/prefork/prefork.c

+3 −0
Changes for server/mpm/prefork/prefork.c: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -318,6 +318,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 */
@@ -338,6 +339,7 @@ static void sig_term(int sig) 
         */

        return;

    }

    mpm_state = AP_MPMQ_STOPPING;

    shutdown_pending = 1;

    is_graceful = (sig == AP_SIG_GRACEFUL_STOP);

}
@@ -351,6 +353,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);

}