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

(-)server/mpm/prefork/prefork.c (-2 / +6 lines)
Lines 546-555 static void child_main(int child_num_arg, int chil Link Here
546
                status = apr_pollset_poll(pollset, apr_time_from_sec(10),
546
                status = apr_pollset_poll(pollset, apr_time_from_sec(10),
547
                                          &numdesc, &pdesc);
547
                                          &numdesc, &pdesc);
548
                if (status != APR_SUCCESS) {
548
                if (status != APR_SUCCESS) {
549
                    if (APR_STATUS_IS_TIMEUP(status) ||
549
                    if (APR_STATUS_IS_EINTR(status)) {
550
                        APR_STATUS_IS_EINTR(status)) {
551
                        continue;
550
                        continue;
552
                    }
551
                    }
552
                    if (APR_STATUS_IS_TIMEUP(status)) {
553
                        SAFE_ACCEPT(accept_mutex_off());
554
                        goto check_pod;
555
                    }
553
                    /* Single Unix documents select as returning errnos
556
                    /* Single Unix documents select as returning errnos
554
                     * EBADF, EINTR, and EINVAL... and in none of those
557
                     * EBADF, EINTR, and EINVAL... and in none of those
555
                     * cases does it make sense to continue.  In fact
558
                     * cases does it make sense to continue.  In fact
Lines 616-621 static void child_main(int child_num_arg, int chil Link Here
616
            ap_lingering_close(current_conn);
619
            ap_lingering_close(current_conn);
617
        }
620
        }
618
621
622
    check_pod:
619
        /* Check the pod and the generation number after processing a
623
        /* Check the pod and the generation number after processing a
620
         * connection so that we'll go away if a graceful restart occurred
624
         * connection so that we'll go away if a graceful restart occurred
621
         * while we were processing the connection or we are the lucky
625
         * while we were processing the connection or we are the lucky

Return to bug 53579