From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Fri, 26 Oct 2001 19:39:51 +0000 (+0000)
Subject: Fix RedirectMatch handling to properly handle URLs with host portions.
X-Git-Tag: 2.0.27~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f2eeda9d0f9d31dce815068cf82e9949c0ed298;p=apache

Fix RedirectMatch handling to properly handle URLs with host portions.
Previously, we would segfault if no path is specified (case 1 below).
We would also ignore any host and scheme portion of the URL (which is
how we specify it on daedalus), so restore that capability.

The query strings will still not be escaped (standards cops can
determine if this is correct behavior).

The following directives now work as expected:
RedirectMatch /jakarta1(.*) http://jakarta.apache.org$1
RedirectMatch /jakarta2(.*) http://jakarta.apache.org/dist$1
RedirectMatch /jakarta3(.*) http://jakarta.apache.org/dist$1?bar=foo
RedirectMatch /jakarta4(.*) http://jakarta.apache.org/dist$1?bar=foo#spaz


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

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index 7d6f76444d..314a387b52 100644
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -338,13 +338,17 @@ static char *try_alias_list(request_rec *r, apr_array_header_t *aliases, int doe
 		    if (found && doesc) {
                         apr_uri_t uri;
                         apr_uri_parse(r->pool, found, &uri);
-			found = ap_escape_uri(r->pool, uri.path);
+                        /* Do not escape the query string or fragment. */
+                        found = apr_uri_unparse(r->pool, &uri, 
+                                                APR_URI_UNP_OMITQUERY);
+                        found = ap_escape_uri(r->pool, found);
                         if (uri.query) {
-                            found = apr_pstrcat(r->pool, found, "?", uri.query, NULL);
+                            found = apr_pstrcat(r->pool, found, "?", 
+                                                uri.query, NULL);
                         }
-                        else if (uri.fragment) {
-                            found = apr_pstrcat(r->pool, found, "#", uri.fragment, NULL);
-
+                        if (uri.fragment) {
+                            found = apr_pstrcat(r->pool, found, "#", 
+                                                uri.fragment, NULL);
                         }
 		    }
 		}