From: Ruediger Pluem <rpluem@apache.org>
Date: Tue, 25 Oct 2005 19:56:39 +0000 (+0000)
Subject: Merge r328463 from trunk:
X-Git-Tag: 2.1.9~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3c6296bac4a3d09065b9fcb9782fc8aa8db61c6;p=thirdparty%2Fapache%2Fhttpd.git

Merge r328463 from trunk:

* 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/branches/2.2.x@328465 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index e7ac218afdc..cb656589869 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 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 568c9be777e..1ee15ba13ea 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 9470b59fdc8..b78d019708b 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);