summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2000-04-10 19:27:26 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2000-04-10 19:27:26 +0000
commitbdfdd9d4afa61d0fc1952f89dec3a609e44ccffd (patch)
tree1076f786f6a4d1f9b60411f536cae9180db1ed5c
parentfafd04fe3a1b3cde2c1f4a4fc212008555bae5cf (diff)
downloadlibapr-bdfdd9d4afa61d0fc1952f89dec3a609e44ccffd.tar.gz
permanent_pool was not initialized from the proper variable and was
left NULL. It was incorrectly initialized in code I added for apr_pools.c version 1.36. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59819 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--lib/apr_pools.c2
-rw-r--r--memory/unix/apr_pools.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/apr_pools.c b/lib/apr_pools.c
index 5ff0de439..711385325 100644
--- a/lib/apr_pools.c
+++ b/lib/apr_pools.c
@@ -522,7 +522,7 @@ API_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retc
p->sub_pools = new_pool;
}
else {
- permanent_pool = p;
+ permanent_pool = new_pool;
}
#if APR_HAS_THREADS
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index 5ff0de439..711385325 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -522,7 +522,7 @@ API_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retc
p->sub_pools = new_pool;
}
else {
- permanent_pool = p;
+ permanent_pool = new_pool;
}
#if APR_HAS_THREADS