Commit 834b7241 authored by Greg Ames's avatar Greg Ames
Browse files

fix a problem in the threaded and worker mpm's where a keepalive connection 

on one thread can prevent the process from exiting.

let's rename ap_graceful_restart_signalled to something more appropriate
after the next beta.


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

server/mpm/threaded/threaded.c

+4 −2
Original line number Diff line number Diff line
@@ -436,9 +436,11 @@ static void set_signals(void) 
 */



int ap_graceful_stop_signalled(void)

        /* XXX this is really a bad confusing obsolete name

         * maybe it should be ap_mpm_process_exiting?

         */

{

    /* XXX - Does this really work? - Manoj */

    return is_graceful;

    return workers_may_exit;

}



/*****************************************************************

server/mpm/worker/worker.c

+4 −2
Original line number Diff line number Diff line
@@ -444,9 +444,11 @@ static void set_signals(void) 
 */



int ap_graceful_stop_signalled(void)

    /* XXX this is really a bad confusing obsolete name

     * maybe it should be ap_mpm_process_exiting?

     */

{

    /* XXX - Does this really work? - Manoj */

    return is_graceful;

    return workers_may_exit;

}



/*****************************************************************