httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/modules/dav/main props.c
Date Thu, 23 Jan 2003 17:59:21 GMT
jerenkrantz    2003/01/23 09:59:21

  Modified:    modules/dav/main props.c
  Log:
  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.
  
  Revision  Changes    Path
  1.33      +10 -5     httpd-2.0/modules/dav/main/props.c
  
  Index: props.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/props.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -u -r1.32 -r1.33
  --- props.c	29 Oct 2002 06:16:42 -0000	1.32
  +++ props.c	23 Jan 2003 17:59:20 -0000	1.33
  @@ -571,7 +571,7 @@
   #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 @@
   
   void dav_close_propdb(dav_propdb *propdb)
   {
  -    if (propdb->db == NULL)
  -        return;
  -
  -    (*propdb->db_hooks->close)(propdb->db);
  +    if (propdb->db != NULL) {
  +        (*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)
  
  
  

Mime
View raw message