From 00933409fe22f7963d88ad8cf21f2e3b3cf7ef9d Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Tue, 25 Oct 2005 19:54:11 +0000 Subject: [PATCH] * Fix PR36906 by not lower caseing the whole worker name. Only lower case the schema when storing the worker url. Thus preventing case sensitive URI's in BalancerMembers to get broken. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@328463 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/proxy/mod_proxy.c | 1 - modules/proxy/proxy_util.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index e5d9600916..9851c89b91 100644 --- a/CHANGES +++ b/CHANGES @@ -40,6 +40,9 @@ Changes with Apache 2.3.0 Changes with Apache 2.1.9 + *) mod_proxy: Do not lowercase the entire worker name of a BalancerMember + since this breaks case sensitive URI's. PR36906. [Ruediger Pluem] + *) core: AddOutputFilterByType is ignored for proxied requests. PR31226. [Joe Orton, Ruediger Pluem] diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 568c9be777..1ee15ba13e 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -1435,7 +1435,6 @@ static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg) return "BalancerMember must define remote proxy server"; ap_str_tolower(path); /* lowercase scheme://hostname */ - ap_str_tolower(name); /* lowercase scheme://hostname */ /* Try to find existing worker */ worker = ap_proxy_get_worker(cmd->temp_pool, conf, name); diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 9470b59fdc..b78d019708 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -1290,6 +1290,7 @@ PROXY_DECLARE(const char *) ap_proxy_add_worker(proxy_worker **worker, } ap_str_tolower(uri.hostname); + ap_str_tolower(uri.scheme); *worker = apr_array_push(conf->workers); memset(*worker, 0, sizeof(proxy_worker)); (*worker)->name = apr_uri_unparse(p, &uri, APR_URI_UNP_REVEALPASSWORD);