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

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

diff --git a/CHANGES b/CHANGES
index 5dd4de5e6ba24bfe98c97cd1ead83b0a0ede6448..08f3b7297e1c938033280db114aeb77b41d4a2eb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) 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>]
+
   *) forward port of buffer overflow fixes for htdigest. [Thom May]
 
   *) prefork MPM: Use the right permissions for the directory created 

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;
 }