]> granicus.if.org Git - apache/commitdiff
No mo subpool
authorJim Jagielski <jim@apache.org>
Fri, 17 Jun 2011 17:15:57 +0000 (17:15 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 17 Jun 2011 17:15:57 +0000 (17:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1136947 13f79535-47bb-0310-9956-ffa450edef68

modules/slotmem/mod_slotmem_shm.c

index 239b74fe3bf817f3b11a467cf71cccf33358f98b..67736bac306d7d70ac11d03de2b49d269725e8d4 100644 (file)
@@ -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;
 }