Commit f6afc2b7 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

mod_proxy: Fix ProxyRemoteMatch directive. 

MFC: 151248
PR: 33170
Submitted by: Rici Lake <rici ricilake.net>
Reviewed by: jerenkrantz, trawick, fielding, pquerna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@151376 13f79535-47bb-0310-9956-ffa450edef68
parent c3f3fbb1

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.53













  *) mod_proxy: Fix ProxyRemoteMatch directive.  PR 33170.













     [Rici Lake <rici ricilake.net>]



























  *) mod_proxy: Respect errors reported by pre_connection hooks.















     [Jeff Trawick]















































modules/proxy/mod_proxy.c



+2
−1






























Original line number
Diff line number
Diff line








@@ -388,7 +388,8 @@ static int proxy_handler(request_rec *r)













        for (i = 0; i < proxies->nelts; i++) {















            p2 = ap_strchr_c(ents[i].scheme, ':');  /* is it a partial URL? */















            if (strcmp(ents[i].scheme, "*") == 0 ||













                (ents[i].use_regex && ap_regexec(ents[i].regexp, url, 0,NULL, 0)) ||













                (ents[i].use_regex && 













                 ap_regexec(ents[i].regexp, url, 0,NULL, 0) == 0) ||















                (p2 == NULL && strcasecmp(scheme, ents[i].scheme) == 0) ||















                (p2 != NULL &&















                 strncasecmp(url, ents[i].scheme, strlen(ents[i].scheme)) == 0)) {