From: Jim Jagielski <jim@apache.org>
Date: Fri, 17 Jun 2011 17:15:57 +0000 (+0000)
Subject: No mo subpool
X-Git-Tag: 2.3.13~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15bce255d4731fa5f92face6631457fa16483a92;p=apache

No mo subpool

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

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 239b74fe3b..67736bac30 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -650,16 +650,7 @@ static int post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
 static int pre_config(apr_pool_t *p, apr_pool_t *plog,
                       apr_pool_t *ptemp)
 {
-    apr_pool_t *global_pool;
-    apr_status_t rv;
-
-    rv = apr_pool_create(&global_pool, p);
-    if (rv != APR_SUCCESS || !global_pool) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL,
-            "Fatal error: unable to create global pool for shared slotmem");
-        return rv;
-    }
-    slotmem_shm_initgpool(global_pool);
+    slotmem_shm_initgpool(p);
     return OK;
 }