diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2001-08-02 00:17:45 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2001-08-02 00:17:45 +0000 |
| commit | c0dbe658163fac90c3ee93efeca9886b18c83910 (patch) | |
| tree | 6491f3d9f9a0a63ba3a87c3b174774ba62d90ae7 | |
| parent | a99bc9cbb543e4677f326f425c55e41575cf735a (diff) | |
| download | httpd-c0dbe658163fac90c3ee93efeca9886b18c83910.tar.gz | |
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
| -rw-r--r-- | modules/cache/mod_file_cache.c | 3 | ||||
| -rw-r--r-- | modules/dav/main/liveprop.c | 2 | ||||
| -rw-r--r-- | modules/http/mod_mime.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c index 8f11ce35b1..0de8efb279 100644 --- 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 98358afb74..55875d5c73 100644 --- 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 e2257417a0..5f8cc31b60 100644 --- 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; |