Commit 5cbd7dd1 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* 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
parent 17b6db76

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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]










































modules/proxy/mod_proxy.c



+0
−1



























Changes for modules/proxy/mod_proxy.c: 0 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -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);


































modules/proxy/proxy_util.c



+1
−0



























Changes for modules/proxy/proxy_util.c: 1 added line, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -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);