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

diff --git a/CHANGES b/CHANGES
index cf41935102fbaeaaac7f2a256536f047fb5c6e96..df58a4193f53e9dbb2489ba35e42758e62474c8c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 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]
 

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 069c97c3465e54cc4c164360a08aa7140cd9198b..46a375f9880c88be600a9d94903a8a8e806d5722 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -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)) {