summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2013-06-18 16:31:36 +0200
committerJim Jagielski <jim@apache.org>2013-06-18 16:31:36 +0200
commita3aff5b8368cb161ade87ac7d5cc1b7f38ccd8e3 (patch)
treede6881db62c8d05a61092d16c025d06b0ce61580 /server
parentmake opaque (diff)
downloadapache2-a3aff5b8368cb161ade87ac7d5cc1b7f38ccd8e3.tar.xz
apache2-a3aff5b8368cb161ade87ac7d5cc1b7f38ccd8e3.zip
subpool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1494157 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
-rw-r--r--server/mpm/eventopt/eventopt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/mpm/eventopt/eventopt.c b/server/mpm/eventopt/eventopt.c
index b006b139a8..1faf0b28cd 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);