Login | Register
My pages Projects Community openCollabNet

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Catacomb] Re: [dav-dev] Catacomb property value namespace bug fixed, need to have mod_dav and mod_dav_fs fixed...



Hi Chris, thanks for looking into this.

On Fri, Apr 18, 2003 at 10:50:38AM -0700, Chris Knight wrote:
> I've checked in a fix to properly store namespace information in 
> property values. Some notes: 
> * this fix requires the patch to mod_dav listed in
> http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14969 to function
> properly. Given this requirement, I checked in this small change (to 
> props.c) into a branch called "prop_namespace". We can merge it into the
> main trunk when the patch has been applied to mod_dav.
	
I'm not sure this patch is right - the point of the map_namespaces hook
is to build the mapping from namespace URI to integer, so the URIs are
never needed when storing properties, just the integer.

Amit Athavale just posted a patch to fix a mod_dav_fs bug, which looks
correct, and makes the litmus test pass for me.  Do you have a similar
bug in Catacomb?  Here's a simpler version of the patch posted:

Index: modules/dav/fs/dbm.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/dav/fs/dbm.c,v
retrieving revision 1.28
diff -u -r1.28 dbm.c
--- modules/dav/fs/dbm.c	3 Feb 2003 17:52:57 -0000	1.28
+++ modules/dav/fs/dbm.c	21 Apr 2003 08:06:41 -0000
@@ -599,7 +599,7 @@
     ** we don't know the namespace yet, then add it to the map and to our
     ** table of known namespaces.
     */
-    pmap = apr_palloc(db->pool, namespaces->nelts * sizeof(*pmap));
+    m->ns_map = pmap = apr_palloc(db->pool, namespaces->nelts * sizeof(*pmap));
     for (i = namespaces->nelts, puri = (const char **)namespaces->elts;
          i-- > 0;
          ++puri, ++pmap) {
@@ -627,7 +627,6 @@
         }
     }
 
-    m->ns_map = pmap;
     *mapping = m;
     return NULL;
 }