You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2003/05/02 12:56:52 UTC

cvs commit: httpd-2.0/modules/dav/fs dbm.c

trawick     2003/05/02 03:56:52

  Modified:    .        CHANGES
               modules/dav/fs 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.
  
  PR:            11637
  Submitted by:  Amit Athavale <am...@persistent.co.in>
  Reviewed by:   Joe Orton, Jeff Trawick
  
  Revision  Changes    Path
  1.1157    +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1156
  retrieving revision 1.1157
  diff -u -r1.1156 -r1.1157
  --- CHANGES	1 May 2003 13:45:37 -0000	1.1156
  +++ CHANGES	2 May 2003 10:56:50 -0000	1.1157
  @@ -2,6 +2,11 @@
   
     [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 <am...@persistent.co.in>]
  +
     *) forward port of buffer overflow fixes for htdigest. [Thom May]
   
     *) prefork MPM: Use the right permissions for the directory created 
  
  
  
  1.29      +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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- dbm.c	3 Feb 2003 17:52:57 -0000	1.28
  +++ dbm.c	2 May 2003 10:56:51 -0000	1.29
  @@ -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;
   }