*) mod_dav: Fix invalid Location header when a resource is created by passing

   an absolute URI on the request line
+1: jailletc36, jim, minfrin

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

diff --git a/CHANGES b/CHANGES
index 7762b618f9c1c438b5ee51629bd2c64b8f48c06c..11e102e1717e0a91519381fa5abb1dcd05987c39 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.38
 
+  *) mod_dav: Fix invalid Location header when a resource is created by
+     passing an absolute URI on the request line [Jim Jagielski]
+
   *) mod_session_cookie: avoid duplicate Set-Cookie header in the response.
      [Emmanuel Dreyfus <manu@netbsd.org>, Luca Toscano]
 

diff --git a/STATUS b/STATUS
index f5816b7796c983fef1389b4df481ead5a4f69b50..41cba134380ed85aad2d011da68c5db90b912968 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -126,13 +126,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_dav: Fix invalid Location header when a resource is created by passing an
-              absolute URI on the request line
-     trunk patch: http://svn.apache.org/r1592655
-     2.4.x patch: svn merge -c 1592655 ^/httpd/httpd/trunk .
-     +1: jailletc36, jim, minfrin
-     jailletc36: a CHANGE entry should maybe be added
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

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