Commit c98f444a authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

mod_proxy_balancer: Correct doubled-slash ProxyPassReverse 

PR:           51489 51982
Backports:    r1386576, r1386578
Submitted by: jimjag
Reviewed by:  wrowe, druggeri, humbedooh



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1470592 13f79535-47bb-0310-9956-ffa450edef68
parent 8f992520

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -196,12 +196,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
    2.2.x patch: http://people.apache.org/~druggeri/patches/httpd-2.2.x-failontimeout.patch

    +1: druggeri



  * mod_proxy_balancer: Correct doubled-slash ProxyPassReverse

    PR: 51489 51982

    Backport of r1386576, r1386578 attached to 51982 

      https://issues.apache.org/bugzilla/attachment.cgi?id=30179&action=diff

    +1: wrowe, druggeri, humbedooh



  * mod_ssl: Catch missing, mismatched or encrypted client cert/key pairs

    with SSLProxyMachineCertificateFile/Path directives. PR 52212, PR 54698.

    (check at startup, to prevent segfaults at proxy request time)

modules/proxy/proxy_util.c

+6 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,12 @@ PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r, 
                    }

                }

                else if (l1 >= l2 && strncasecmp(worker->name, url, l2) == 0) {

                    /* edge case where fake is just "/"... avoid double slash */

                    if ((ent[i].fake[0] == '/') && (ent[i].fake[1] == 0) && (url[l2] == '/')) {

                        u = apr_pstrdup(r->pool, &url[l2]);

                    } else {

                        u = apr_pstrcat(r->pool, ent[i].fake, &url[l2], NULL);

                    }

                    return ap_construct_url(r->pool, u, r);

                }

                worker++;