You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2003/12/27 07:10:06 UTC
cvs commit: httpd-2.0/modules/dav/fs dbm.c
jerenkrantz 2003/12/26 22:10:06
Modified: . Tag: APACHE_2_0_BRANCH CHANGES
modules/dav/fs Tag: APACHE_2_0_BRANCH dbm.c
Log:
Fix a problem with namespace mappings being dropped in mod_dav_fs;
if any property values were set which defined namespaces these
came out mangled in the PROPFIND response.
Backport of modules/dav/fs/dbm.c r1.29 from httpd-2.1
PR: 11637
Submitted by: Amit Athavale <am...@persistent.co.in>
Reviewed by: Joe Orton, Jeff Trawick, Justin Erenkrantz
Revision Changes Path
No revision
No revision
1.988.2.200 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.199
retrieving revision 1.988.2.200
diff -u -u -r1.988.2.199 -r1.988.2.200
--- CHANGES 27 Dec 2003 06:03:44 -0000 1.988.2.199
+++ CHANGES 27 Dec 2003 06:10:05 -0000 1.988.2.200
@@ -1,5 +1,10 @@
Changes with Apache 2.0.49
+ *) Fix a problem with namespace mappings being dropped in mod_dav_fs;
+ if any property values were set which defined namespaces these
+ came out mangled in the PROPFIND response. PR 11637.
+ [Amit Athavale <amit_athavale persistent.co.in>]
+
*) mod_dav: Return a WWW-auth header for MOVE/COPY requests where
the destination resource gives a 401. PR 15571. [Joe Orton]
No revision
No revision
1.27.2.2 +1 -2 httpd-2.0/modules/dav/fs/dbm.c
Index: dbm.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/fs/dbm.c,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -u -r1.27.2.1 -r1.27.2.2
--- dbm.c 3 Feb 2003 17:31:33 -0000 1.27.2.1
+++ dbm.c 27 Dec 2003 06:10:06 -0000 1.27.2.2
@@ -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;
}