From e02c7b4ed49ea9884be4779b155d39ac0373ebca Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Fri, 23 Nov 2018 15:42:50 +0000 Subject: [PATCH] *) 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 --- CHANGES | 3 +++ STATUS | 7 ------- modules/dav/main/mod_dav.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 7762b618f9c..11e102e1717 100644 --- 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 , Luca Toscano] diff --git a/STATUS b/STATUS index f5816b7796c..41cba134380 100644 --- 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 e3a32466cfb..84012f2d7ac 100644 --- 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? */ -- 2.47.3