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

(-)server/mpm/prefork/prefork.c-dist (-1 / +12 lines)
Lines 570-575 Link Here
570
                apr_int32_t numdesc;
570
                apr_int32_t numdesc;
571
                const apr_pollfd_t *pdesc;
571
                const apr_pollfd_t *pdesc;
572
572
573
                if (die_now) {
574
                    status = !APR_SUCCESS;
575
                    goto unlock;
576
                }
577
573
                /* timeout == -1 == wait forever */
578
                /* timeout == -1 == wait forever */
574
                status = apr_pollset_poll(pollset, -1, &numdesc, &pdesc);
579
                status = apr_pollset_poll(pollset, -1, &numdesc, &pdesc);
575
                if (status != APR_SUCCESS) {
580
                if (status != APR_SUCCESS) {
Lines 618-625 Link Here
618
        /* if we accept() something we don't want to die, so we have to
623
        /* if we accept() something we don't want to die, so we have to
619
         * defer the exit
624
         * defer the exit
620
         */
625
         */
621
        status = lr->accept_func(&csd, lr, ptrans);
626
        if (!die_now) {
627
            status = lr->accept_func(&csd, lr, ptrans);
628
        }
629
        else {
630
            status = !APR_SUCCESS;
631
        }
622
632
633
    unlock:
623
        SAFE_ACCEPT(accept_mutex_off());      /* unlock after "accept" */
634
        SAFE_ACCEPT(accept_mutex_off());      /* unlock after "accept" */
624
635
625
        if (status == APR_EGENERAL) {
636
        if (status == APR_EGENERAL) {

Return to bug 42829