Commit ecf47d9f authored by Jim Jagielski's avatar Jim Jagielski
Browse files

*) prefork: Update MPM state in children during a graceful restart. 

       Allow the HTTP connection handling loop to terminate early 
            during a graceful restart.  PR 41743.
                 [Andrew Punch <andrew.punch 247realmedia.com>]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1069428 13f79535-47bb-0310-9956-ffa450edef68
parent 81cc115e

CHANGES

+10 −0
Changes for CHANGES: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.18



  *) prefork: Update MPM state in children during a graceful restart.

     Allow the HTTP connection handling loop to terminate early 

     during a graceful restart.  PR 41743.

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



  *) mod_ssl: Correctly read full lines in input filter when the line is

     incomplete during first read. PR 50481. [Ruediger Pluem]



  *) mod_autoindex: Merge IndexOptions from server to directory context when

     the directory has no mod_autoindex directives. PR 47766. [Eric Covener]



  *) prefork: Update MPM state in children during a graceful restart.

     Allow the HTTP connection handling loop to terminate early 

     during a graceful restart.  PR 41743.

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



  *) mod_cache: Make sure that we never allow a 304 Not Modified response

     that we asked for to leak to the client should the 304 response be

     uncacheable. PR45341 [Graham Leggett]

STATUS

+0 −5
Changes for STATUS: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -90,11 +90,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  * prefork: Update MPM state in children; implement fast exit from

    connection loop via ap_graceful_stop_signalled.  PR 41743.

    Trunk patch: http://svn.apache.org/viewvc?rev=1068389&view=rev

    2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=26623

    +1: jorton, rpluem, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

server/mpm/prefork/prefork.c

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

        return;

    }

    mpm_state = AP_MPMQ_STOPPING;

    shutdown_pending = 1;

    is_graceful = (sig == AP_SIG_GRACEFUL_STOP);

}
@@ -363,6 +365,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);

}
@@ -458,8 +461,10 @@ static int num_listensocks = 0; 


int ap_graceful_stop_signalled(void)

{

    /* not ever called anymore... */

    return 0;

    /* Return true if the server is stopping for whatever reason; the

     * function is used to initiate a fast exit from the connection

     * processing loop. */

    return mpm_state == AP_MPMQ_STOPPING;

}