From 69ef285a0239373c61cbb662aef490ff7bcd23e5 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Fri, 2 May 2003 10:56:51 +0000 Subject: [PATCH] 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 Reviewed by: Joe Orton, Jeff Trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99690 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 5 +++++ modules/dav/fs/dbm.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 5dd4de5e6b..08f3b7297e 100644 --- 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 ] + *) 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 4c73c5cb81..5cda95062c 100644 --- 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; } -- 2.50.1