From: Martin Kraemer <martin@apache.org>
Date: Thu, 23 Sep 1999 19:29:13 +0000 (+0000)
Subject: When generating the Location: header, mod_speling forgot
X-Git-Tag: 1.3.10~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99154f056f5232ed2b474f341cd52d8e5ad5ab66;p=thirdparty%2Fapache%2Fhttpd.git

When generating the Location: header, mod_speling forgot
to escape the spelling-fixed uri. (Forward-Port from 1.3)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83916 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index f81c88f4b38..2fc64c18a74 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -408,10 +408,11 @@ static int check_speling(request_rec *r)
 	    && (candidates->nelts == 1
 		|| variant[0].quality != variant[1].quality)) {
 
-            nuri = ap_pstrcat(r->pool, url, variant[0].name, r->path_info,
-			      r->parsed_uri.query ? "?" : "",
-			      r->parsed_uri.query ? r->parsed_uri.query : "",
-			      NULL);
+            nuri = ap_escape_uri(r->pool, ap_pstrcat(r->pool, url,
+						     variant[0].name,
+						     r->path_info, NULL));
+	    if (r->parsed_uri.query)
+		nuri = ap_pstrcat(r->pool, nuri, "?", r->parsed_uri.query, NULL);
 
             ap_table_setn(r->headers_out, "Location",
 			  ap_construct_url(r->pool, nuri, r));