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

(-)server/mpm/prefork/prefork.c (-2 / +8 lines)
Lines 330-335 Link Here
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 343-348 Link Here
343
344
344
static void sig_term(int sig)
345
static void sig_term(int sig)
345
{
346
{
347
    mpm_state = AP_MPMQ_STOPPING;
346
    if (shutdown_pending == 1) {
348
    if (shutdown_pending == 1) {
347
        /* Um, is this _probably_ not an error, if the user has
349
        /* Um, is this _probably_ not an error, if the user has
348
         * tried to do a shutdown twice quickly, so we won't
350
         * tried to do a shutdown twice quickly, so we won't
Lines 359-364 Link Here
359
 */
361
 */
360
static void restart(int sig)
362
static void restart(int sig)
361
{
363
{
364
    mpm_state = AP_MPMQ_STOPPING;
362
    if (restart_pending == 1) {
365
    if (restart_pending == 1) {
363
        /* Probably not an error - don't bother reporting it */
366
        /* Probably not an error - don't bother reporting it */
364
        return;
367
        return;
Lines 458-465 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
    /* This function is used by other modules to check for a graceful shutdown 
462
    return 0;
465
     * For example http_core during a keepalive connection 
466
     */
467
468
    return die_now;
463
}
469
}
464
470
465
471

Return to bug 41743