]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Fix PR 56480: PROPFIND walker doesn't encode hrefs properly
authorWilliam A. Rowe Jr <wrowe@apache.org>
Wed, 16 Jul 2014 21:03:30 +0000 (21:03 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Wed, 16 Jul 2014 21:03:30 +0000 (21:03 +0000)
commit3068349cd25921012ffdcfcc1a1c278e309b342a
treec6de3bea5fc5e86e86281874073da507b4658231
parentfd7e78dc7ab335965eb667e1f8ab0a8ef86f0ba9
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
PR: 56480
Backports: r1602338
Reviewed by: breser, rpluem, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1611189 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/dav/fs/repos.c
modules/dav/main/mod_dav.c
modules/dav/main/mod_dav.h
modules/dav/main/props.c