You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2005/02/04 18:36:58 UTC
svn commit: r151376 - in httpd/httpd/branches/2.0.x: CHANGES
modules/proxy/mod_proxy.c
Author: jerenkrantz
Date: Fri Feb 4 09:36:55 2005
New Revision: 151376
URL: http://svn.apache.org/viewcvs?view=rev&rev=151376
Log:
mod_proxy: Fix ProxyRemoteMatch directive.
MFC: 151248
PR: 33170
Submitted by: Rici Lake <rici ricilake.net>
Reviewed by: jerenkrantz, trawick, fielding, pquerna
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/modules/proxy/mod_proxy.c
Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?view=diff&r1=151375&r2=151376
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES (original)
+++ httpd/httpd/branches/2.0.x/CHANGES Fri Feb 4 09:36:55 2005
@@ -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]
Modified: httpd/httpd/branches/2.0.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/proxy/mod_proxy.c?view=diff&r1=151375&r2=151376
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.0.x/modules/proxy/mod_proxy.c Fri Feb 4 09:36:55 2005
@@ -388,7 +388,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, strlen(ents[i].scheme)) == 0)) {