summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhalex <halex@openbsd.org>2010-03-31 23:40:35 +0000
committerhalex <halex@openbsd.org>2010-03-31 23:40:35 +0000
commit266df20085cf46cec641bf2b33b6521901064257 (patch)
treedde7bc2c48acd9ebe76ec6e90586ebe59b29f10d
parentMore carefully manage PG_PMAP_EXE bit and cache flushing on pmap_protect (diff)
downloadwireguard-openbsd-266df20085cf46cec641bf2b33b6521901064257.tar.xz
wireguard-openbsd-266df20085cf46cec641bf2b33b6521901064257.zip
make ProxyPass exclude directives only exclude on match, instead of always
noted by Vasiliy Kiryanov, thanks! ok stephan@
-rw-r--r--usr.sbin/httpd/src/modules/proxy/mod_proxy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/httpd/src/modules/proxy/mod_proxy.c b/usr.sbin/httpd/src/modules/proxy/mod_proxy.c
index 2f476807214..1be9812093a 100644
--- a/usr.sbin/httpd/src/modules/proxy/mod_proxy.c
+++ b/usr.sbin/httpd/src/modules/proxy/mod_proxy.c
@@ -199,10 +199,10 @@ static int proxy_trans(request_rec *r)
for (i = 0; i < conf->aliases->nelts; i++) {
len = alias_match(r->uri, ent[i].fake);
- if (ent[i].real[0] == '!' && ent[i].real[1] == '\0')
- return DECLINED;
-
if (len > 0) {
+ if (ent[i].real[0] == '!' && ent[i].real[1] == '\0')
+ return DECLINED;
+
r->filename = ap_pstrcat(r->pool, "proxy:", ent[i].real,
r->uri + len, NULL);
r->handler = "proxy-server";