From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Thu, 23 Jan 2003 17:59:20 +0000 (+0000)
Subject: Create a subpool when we open the propdb, but we can't clear it until the rest
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c78c7fbd54ab1f7dc3ffb8bbca0a9912535080b6;p=apache

Create a subpool when we open the propdb, but we can't clear it until the rest
of the lifetime issues within mod_dav are straightened out.


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

diff --git a/modules/dav/main/props.c b/modules/dav/main/props.c
index ca3c3f2805..d538725ad3 100644
--- a/modules/dav/main/props.c
+++ b/modules/dav/main/props.c
@@ -571,7 +571,7 @@ dav_error *dav_open_propdb(request_rec *r, dav_lockdb *lockdb,
 #endif
 
     propdb->r = r;
-    propdb->p = r->pool; /* ### get rid of this */
+    apr_pool_create(&propdb->p, r->pool);
     propdb->resource = resource;
     propdb->ns_xlate = ns_xlate;
 
@@ -592,10 +592,15 @@ dav_error *dav_open_propdb(request_rec *r, dav_lockdb *lockdb,
 
 void dav_close_propdb(dav_propdb *propdb)
 {
-    if (propdb->db == NULL)
-        return;
+    if (propdb->db != NULL) {
+        (*propdb->db_hooks->close)(propdb->db);
+    }
 
-    (*propdb->db_hooks->close)(propdb->db);
+    /* Currently, mod_dav's pool usage doesn't clearing this pool. */
+#if 0
+    apr_pool_destroy(propdb->p);
+#endif
+    return;
 }
 
 dav_get_props_result dav_get_allprops(dav_propdb *propdb, dav_prop_insert what)