svn commit: r328465 - in /httpd/httpd/branches/2.2.x: CHANGES modules/proxy/mod_proxy.c modules/proxy/proxy_util.c

[rp...@apache.org]

Author: rpluem
Date: Tue Oct 25 12:56:39 2005
New Revision: 328465

URL: http://svn.apache.org/viewcvs?rev=328465&view=rev
Log:
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.

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c
    httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=328465&r1=328464&r2=328465&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Oct 25 12:56:39 2005
@@ -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]
 

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c?rev=328465&r1=328464&r2=328465&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c Tue Oct 25 12:56:39 2005
@@ -1435,7 +1435,6 @@
         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);

Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?rev=328465&r1=328464&r2=328465&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Tue Oct 25 12:56:39 2005
@@ -1290,6 +1290,7 @@
     }
 
     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);