From: Jim Jagielski <jim@apache.org>
Date: Tue, 18 Jun 2013 14:31:36 +0000 (+0000)
Subject: subpool
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c380fd8497130a579df619d86494a8b9096e5d1b;p=thirdparty%2Fapache%2Fhttpd.git

subpool


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

diff --git a/server/mpm/eventopt/eventopt.c b/server/mpm/eventopt/eventopt.c
index b006b139a8d..1faf0b28cdf 100644
--- a/server/mpm/eventopt/eventopt.c
+++ b/server/mpm/eventopt/eventopt.c
@@ -2249,6 +2249,7 @@ static void child_main(int child_num_arg)
     thread_starter *ts;
     apr_threadattr_t *thread_attr;
     apr_thread_t *start_thread_id;
+    apr_pool_t *pskip;
 
     mpm_state = AP_MPMQ_STARTING;       /* for benefit of any hooks that run as this
                                          * child initializes
@@ -2266,7 +2267,8 @@ static void child_main(int child_num_arg)
 
     apr_thread_mutex_create(&g_timer_skiplist_mtx, APR_THREAD_MUTEX_DEFAULT, pchild);
     APR_RING_INIT(&timer_free_ring, timer_event_t, link);
-    ap_skiplist_init(&timer_skiplist, pchild);
+    apr_pool_create(&pskip, pchild);
+    ap_skiplist_init(&timer_skiplist, pskip);
     ap_skiplist_set_compare(timer_skiplist, indexing_comp, indexing_compk);
     ap_run_child_init(pchild, ap_server_conf);