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 <amit_athavale@persistent.co.in>
Reviewed by:	Joe Orton, Jeff Trawick, Justin Erenkrantz

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102114 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 9e1928f704256e4c218195cce96b4c97a87256d0..f2fc6d830bcbca1fdc18117335deaca463ca94e4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/modules/dav/fs/dbm.c b/modules/dav/fs/dbm.c
index 4c73c5cb81a7a534e555a228f93ae1777ed4af14..5cda95062cdfbff49d92beb8a81515ad63d91465 100644 (file)
--- a/modules/dav/fs/dbm.c
+++ b/modules/dav/fs/dbm.c
@@ -599,7 +599,7 @@ static dav_error * dav_propdb_map_namespaces(
     ** 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 @@ static dav_error * dav_propdb_map_namespaces(
         }
     }
 
-    m->ns_map = pmap;
     *mapping = m;
     return NULL;
 }