From: Takashi Sato <takashi@apache.org>
Date: Sat, 21 Jun 2014 12:58:35 +0000 (+0000)
Subject: Do not call a timeout callback after the asociated socket
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddb6b6b46a184e3263f52d71fcfd30c742bd0542;p=thirdparty%2Fapache%2Fhttpd.git

Do not call a timeout callback after the asociated socket
woke and the socket callback was called.
PR 56642


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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index d9db457a073..eab34b8bd9c 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1773,8 +1773,8 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy)
                             apr_pollset_remove(event_pollset, *pfds);
                         }
                     }
+                    push_timer2worker(ep);
                 }
-                push_timer2worker(ep);
             }
             else {
                 break;