mod_proxy: Fix ProxyRemoteMatch directive.

PR: 33170
Submitted by: Rici Lake <rici ricilake.net>
Reviewed by:  Justin Erenkrantz

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151248 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index f30ae597e28b211369bf3e58266ee8374767e544..14c452b5f87ca3f8644b71150758ce426c81c313 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.3
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_proxy: Fix ProxyRemoteMatch directive.  PR 33170.
+     [Rici Lake <rici ricilake.net>]
+
   *) proxy HTTP: Rework the handling of request bodies to handle
      chunked input and input filters which modify content length, and
      avoid spooling arbitrary-sized request bodies in memory.

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 7a3e5814862ead73d85dd98ced97f824866a3805..735d3e9168aecc5c6e854a75d638aaee2dc35969 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -618,8 +618,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,