You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ta...@apache.org on 2014/06/21 14:58:36 UTC

svn commit: r1604347 - /httpd/httpd/trunk/server/mpm/event/event.c

Author: takashi
Date: Sat Jun 21 12:58:35 2014
New Revision: 1604347

URL: http://svn.apache.org/r1604347
Log:
Do not call a timeout callback after the asociated socket
woke and the socket callback was called.
PR 56642

Modified:
    httpd/httpd/trunk/server/mpm/event/event.c

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1604347&r1=1604346&r2=1604347&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Sat Jun 21 12:58:35 2014
@@ -1773,8 +1773,8 @@ static void * APR_THREAD_FUNC listener_t
                             apr_pollset_remove(event_pollset, *pfds);
                         }
                     }
+                    push_timer2worker(ep);
                 }
-                push_timer2worker(ep);
             }
             else {
                 break;