Need some context for the iterator! Finally get to use that accessor :)

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

diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c
index 8f11ce35b1e298a0bc466711e389215de70db9f7..0de8efb279481c40e7a4adc9e7ae9f538251e2da 100644 (file)
--- a/modules/cache/mod_file_cache.c
+++ b/modules/cache/mod_file_cache.c
@@ -165,11 +165,12 @@ static void *create_server_config(apr_pool_t *p, server_rec *s)
 static apr_status_t cleanup_file_cache(void *sconfv)
 {
     a_server_config *sconf = sconfv;
+    apr_pool_t *p = apr_hash_pool_get(sconf->fileht);
     a_file *file;
     apr_hash_index_t *hi;
 
     /* Iterate over the file hash table and clean up each entry */
-    for (hi = apr_hash_first(sconf->fileht); hi; hi=apr_hash_next(hi)) {
+    for (hi = apr_hash_first(p, sconf->fileht); hi; hi=apr_hash_next(hi)) {
         apr_hash_this(hi, NULL, NULL, (void **)&file);
 #if APR_HAS_MMAP
         if (file->is_mmapped) { 

diff --git a/modules/dav/main/liveprop.c b/modules/dav/main/liveprop.c
index 98358afb741fa841a5087fda8b66171f142db568..55875d5c73ff613bde9ded0a7103757b2809f4e2 100644 (file)
--- a/modules/dav/main/liveprop.c
+++ b/modules/dav/main/liveprop.c
@@ -103,7 +103,7 @@ int dav_get_liveprop_ns_count(void)
 
 void dav_add_all_liveprop_xmlns(apr_pool_t *p, ap_text_header *phdr)
 {
-    apr_hash_index_t *idx = apr_hash_first(dav_liveprop_uris);
+    apr_hash_index_t *idx = apr_hash_first(p, dav_liveprop_uris);
 
     for ( ; idx != NULL; idx = apr_hash_next(idx) ) {
         const void *key;

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index e2257417a0d72ced975de30276c293a6feaa59c3..5f8cc31b6028e9ca850976827e12f2f4df154c2a 100644 (file)
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -169,7 +169,7 @@ static void overlay_extension_mappings(apr_pool_t *p,
                                        apr_hash_t *overlay, apr_hash_t *base)
 {
     apr_hash_index_t *index;
-    for (index = apr_hash_first(overlay); index;
+    for (index = apr_hash_first(p, overlay); index;
          index = apr_hash_next(index)) {
         char *key;
         apr_ssize_t klen;