]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Fix PR 56480: PROPFIND walker doesn't encode hrefs properly
authorBen Reser <breser@apache.org>
Fri, 13 Jun 2014 08:34:05 +0000 (08:34 +0000)
committerBen Reser <breser@apache.org>
Fri, 13 Jun 2014 08:34:05 +0000 (08:34 +0000)
commitbd5008c8f331f04b85bf92fd758d3e1254c54efc
tree3354b19af9e5561484b2450f2a7cdef874ba844e
parent3187158d4f543fd56c9e77545286eeb3779042c9
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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602338 13f79535-47bb-0310-9956-ffa450edef68
modules/dav/fs/repos.c
modules/dav/main/mod_dav.c
modules/dav/main/mod_dav.h
modules/dav/main/props.c