httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r151248 - in httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy.c
Date Thu, 03 Feb 2005 23:18:50 GMT
Author: jerenkrantz
Date: Thu Feb  3 15:18:48 2005
New Revision: 151248

URL: http://svn.apache.org/viewcvs?view=rev&rev=151248
Log:
mod_proxy: Fix ProxyRemoteMatch directive.

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

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/mod_proxy.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&r1=151247&r2=151248
==============================================================================
--- httpd/httpd/trunk/CHANGES (original)
+++ httpd/httpd/trunk/CHANGES Thu Feb  3 15:18:48 2005
@@ -2,6 +2,9 @@
 
   [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.

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_proxy.c?view=diff&r1=151247&r2=151248
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Thu Feb  3 15:18:48 2005
@@ -618,8 +618,8 @@
             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,



Mime
View raw message