Attachment #26623 for bug #41743

View | Details | Raw Unified | Return to bug 41743
Collapse All | Expand All





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 */

         */
        return;
    }
    mpm_state = AP_MPMQ_STOPPING;
    shutdown_pending = 1;
    is_graceful = (sig == AP_SIG_GRACEFUL_STOP);
}

        /* Probably not an error - don't bother reporting it */
        return;
    }
    mpm_state = AP_MPMQ_STOPPING;
    restart_pending = 1;
    is_graceful = (sig == AP_SIG_GRACEFUL);
}


int ap_graceful_stop_signalled(void)
{
    /* 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;
}



Lines 1-6 Link Here

(-)CHANGES (+5 lines)
1	-- coding: utf-8 --	1	-- coding: utf-8 --
2	Changes with Apache 2.2.18	2	Changes with Apache 2.2.18
3		3
		4	*) prefork: Update MPM state in children during a graceful restart.
		5	Allow the HTTP connection handling loop to terminate early
		6	during a graceful restart. PR 41743.
		7	[Andrew Punch <andrew.punch 247realmedia.com>]
		8
4	*) mod_cache: Make sure that we never allow a 304 Not Modified response	9	*) mod_cache: Make sure that we never allow a 304 Not Modified response
5	that we asked for to leak to the client should the 304 response be	10	that we asked for to leak to the client should the 304 response be
6	uncacheable. PR45341 [Graham Leggett]	11	uncacheable. PR45341 [Graham Leggett]

Return to bug 41743

Lines 330-335 static void just_die(int sig) Link Here

(-)server/mpm/prefork/prefork.c (-2 / +7 lines)
330		330
331	static void stop_listening(int sig)	331	static void stop_listening(int sig)
332	{	332	{
		333	mpm_state = AP_MPMQ_STOPPING;
333	ap_close_listeners();	334	ap_close_listeners();
334		335
335	/* For a graceful stop, we want the child to exit when done */	336	/* For a graceful stop, we want the child to exit when done */
Lines 350-355 static void sig_term(int sig) Link Here
350	*/	351	*/
351	return;	352	return;
352	}	353	}
		354	mpm_state = AP_MPMQ_STOPPING;
353	shutdown_pending = 1;	355	shutdown_pending = 1;
354	is_graceful = (sig == AP_SIG_GRACEFUL_STOP);	356	is_graceful = (sig == AP_SIG_GRACEFUL_STOP);
355	}	357	}
Lines 363-368 static void restart(int sig) Link Here
363	/* Probably not an error - don't bother reporting it */	365	/* Probably not an error - don't bother reporting it */
364	return;	366	return;
365	}	367	}
		368	mpm_state = AP_MPMQ_STOPPING;
366	restart_pending = 1;	369	restart_pending = 1;
367	is_graceful = (sig == AP_SIG_GRACEFUL);	370	is_graceful = (sig == AP_SIG_GRACEFUL);
368	}	371	}
Lines 458-465 static int num_listensocks = 0; Link Here
458		461
459	int ap_graceful_stop_signalled(void)	462	int ap_graceful_stop_signalled(void)
460	{	463	{
461	/* not ever called anymore... */	464	/* Return true if the server is stopping for whatever reason; the
462	return 0;	465	* function is used to initiate a fast exit from the connection
		466	* processing loop. */
		467	return mpm_state == AP_MPMQ_STOPPING;
463	}	468	}
464		469
465		470