Skip to content
  • Jeff Trawick's avatar
    Merge r1602338 from trunk: · 8b956c42
    Jeff Trawick authored
    Fix PR 56480: PROPFIND walker doesn't encode hrefs properly
    
    Reverts r1529559 partially (specifically the dav_xml_escape_uri) bit.
    Reverts r1531505 entirely.
    
    * modules/dav/main/mod_dav.c
      (dav_xml_escape_uri): Revert the piece of r1529559 that removes the URI
        escaping from this function.
    
    * modules/dav/main/props.c
      (dav_do_prop_subreq): Escape the URI before doing a sub request with it.
        This resolves some properties like getcontenttype from failing to be
        returned for files that contain characters that require encoding in their
        path.
    
    * modules/dav/main/mod_dav.h
      (dav_resource): Note the inconsistency in the documentation.
    
    * modules/dav/fs/repos.c
      (dav_fs_get_resource): Don't use the unparsed_uri to set the uri field of
        the resource.  This is the correct fix for the double encoding in mod_dav_fs
        that led to the dav_xml_escape_uri() change and r1531505.
      (dav_fs_walker, dav_fs_append_uri): Revert r1531505 changes.
    
    Submitted by: breser
    Reviewed by: ylavic, covener
    
    
    git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1610013 13f79535-47bb-0310-9956-ffa450edef68
    8b956c42
To find the state of this project's repository at the time of any of these versions, check out the tags.