From: Yann Ylavic <ylavic@apache.org>
Date: Sat, 21 Jun 2014 20:02:23 +0000 (+0000)
Subject: event: follow up to r1604347.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=487fc6cd62d249738ab85ccd5fd2656b11e9e463;p=thirdparty%2Fapache%2Fhttpd.git

event: follow up to r1604347.
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
---

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 9980f5606e1..f169742fff2 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -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;