Commit a0850d7e authored by Jeff Trawick's avatar Jeff Trawick
Browse files

follow up to r1202257 -- perform normal wakeup processing when 

APR_EINTR is seen from apr_pollset_poll(), with expectation that
it was triggered by apr_pollset_wakeup()


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

server/mpm/event/event.c

+3 −6
Changes for server/mpm/event/event.c: 3 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -1481,17 +1481,14 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy) 
        }

#endif

        rc = apr_pollset_poll(event_pollset, timeout_interval, &num, &out_pfd);

        if (rc != APR_SUCCESS) {

            if (APR_STATUS_IS_EINTR(rc)) {

                continue;

            }

            if (!APR_STATUS_IS_TIMEUP(rc)) {

        if (rc != APR_SUCCESS

            && !APR_STATUS_IS_EINTR(rc)

            && !APR_STATUS_IS_TIMEUP(rc)) {

            ap_log_error(APLOG_MARK, APLOG_CRIT, rc, ap_server_conf,

                         "apr_pollset_poll failed.  Attempting to "

                         "shutdown process gracefully");

            signal_threads(ST_GRACEFUL);

        }

        }



        if (listener_may_exit) {

            close_listeners(process_slot, &closed);