]> granicus.if.org Git - apache/commitdiff
Do not call a timeout callback after the asociated socket
authorTakashi Sato <takashi@apache.org>
Sat, 21 Jun 2014 12:58:35 +0000 (12:58 +0000)
committerTakashi Sato <takashi@apache.org>
Sat, 21 Jun 2014 12:58:35 +0000 (12:58 +0000)
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

server/mpm/event/event.c

index d9db457a0734cf81c6df8d9be8136f8b3d7fbc40..eab34b8bd9c0619b1aaa72a85d4bb06869f22ade 100644 (file)
@@ -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;