mod_dav: Ensure URI is correctly uriencoded on return. PR 54611

trunk patch: http://svn.apache.org/r1476621
Submitted by: Timothy Wood <tjw omnigroup.com>
Reviewed by: minfrin, jim, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1485721 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 5d03c6be4d66ad0fa041c7eee41827e66b744faa..a8774a9c465f6f0a1a352de8a68ad38145fba90f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.5
 
+  *) mod_dav: Ensure URI is correctly uriencoded on return. PR 54611
+     [Timothy Wood <tjw omnigroup.com>]
+
   *) core: apachectl -S prints wildcard name-based virtual hosts twice. 
      PR54948 [Eric Covener]
 

diff --git a/STATUS b/STATUS
index 391409102dac5285eef64963232b75d7eb427d8a..99f4ba2bc979d79753df353073b0ebcf292383cc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,11 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_dav: Ensure URI is correctly uriencoded on return. PR 54611
-      trunk patch: http://svn.apache.org/r1476621
-      2.4.x patch: trunk patch works (minus CHANGES)
-      +1: minfrin, jim, covener
-
     * core: speed up (for common cases) and reduce memory usage of ap_escape_logitem
       This should save 70-100 bytes in the request pool for a default config.
       trunk patch: http://svn.apache.org/r1485409

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index b5059175ca31a4020144ae483695bea407e94ddb..2c323f48f857704991cee17d12a7354119ec4925 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -611,7 +611,9 @@ static int dav_created(request_rec *r, const char *locn, const char *what,
     const char *body;
 
     if (locn == NULL) {
-        locn = r->uri;
+        locn = r->unparsed_uri;
+    } else {
+        locn = ap_escape_uri(r->pool, locn);
     }
 
     /* did the target resource already exist? */