You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/08/02 02:17:45 UTC

cvs commit: httpd-2.0/modules/dav/main liveprop.c

wrowe       01/08/01 17:17:45

  Modified:    modules/http mod_mime.c
               modules/cache mod_file_cache.c
               modules/dav/main liveprop.c
  Log:
    Need some context for the iterator!  Finally get to use that accessor :)
  
  Revision  Changes    Path
  1.45      +1 -1      httpd-2.0/modules/http/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/mod_mime.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- mod_mime.c	2001/08/01 23:33:08	1.44
  +++ mod_mime.c	2001/08/02 00:17:45	1.45
  @@ -169,7 +169,7 @@
                                          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;
  
  
  
  1.61      +2 -1      httpd-2.0/modules/cache/mod_file_cache.c
  
  Index: mod_file_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/cache/mod_file_cache.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- mod_file_cache.c	2001/07/31 16:34:14	1.60
  +++ mod_file_cache.c	2001/08/02 00:17:45	1.61
  @@ -165,11 +165,12 @@
   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) { 
  
  
  
  1.11      +1 -1      httpd-2.0/modules/dav/main/liveprop.c
  
  Index: liveprop.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/liveprop.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- liveprop.c	2001/02/23 11:48:59	1.10
  +++ liveprop.c	2001/08/02 00:17:45	1.11
  @@ -103,7 +103,7 @@
   
   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;