From: Graham Leggett <minfrin@apache.org>
Date: Thu, 23 May 2013 14:14:19 +0000 (+0000)
Subject: mod_dav: Ensure URI is correctly uriencoded on return. PR 54611
X-Git-Tag: 2.4.5~246
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4284acd51d68770aa31812b393dd7f97928d7d97;p=apache

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 5d03c6be4d..a8774a9c46 100644
--- 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 391409102d..99f4ba2bc9 100644
--- 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 b5059175ca..2c323f48f8 100644
--- 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? */