From ecd6cdf25630583eba5a4b02a25b0f1cc3f31d1b Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Fri, 18 Nov 2011 21:39:33 +0000 Subject: [PATCH] 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 --- server/mpm/event/event.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index cb1266bb87..e49a6c3e3d 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -1481,16 +1481,13 @@ 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)) { - 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 (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) { -- 2.40.0