]> granicus.if.org Git - apache/commitdiff
event: follow up to r1604347.
authorYann Ylavic <ylavic@apache.org>
Sat, 21 Jun 2014 20:02:23 +0000 (20:02 +0000)
committerYann Ylavic <ylavic@apache.org>
Sat, 21 Jun 2014 20:02:23 +0000 (20:02 +0000)
Don't leak the timer event when it is cancelled.

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

server/mpm/event/event.c

index 9980f5606e17fb86d42318cef5b6852c4a3b0056..f169742fff21d05c3c1c95fd753365e96e961292 100644 (file)
@@ -1765,6 +1765,10 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy)
                     }
                     push_timer2worker(ep);
                 }
+                else {
+                    APR_RING_INSERT_TAIL(&timer_free_ring, ep, timer_event_t,
+                                         link);
+                }
             }
             else {
                 break;