diff options
author | Alexander Hall <halex@cvs.openbsd.org> | 2010-03-31 23:40:36 +0000 |
---|---|---|
committer | Alexander Hall <halex@cvs.openbsd.org> | 2010-03-31 23:40:36 +0000 |
commit | eb41073aca4d8fc2750bc5a3c22d8429e9a5ac0e (patch) | |
tree | e3cbd9c26352ec2be9a5c6526eeceb7e8224e352 /usr.sbin | |
parent | 2c39fc8e77480224ed2b3373d8f3c11e1297b632 (diff) |
make ProxyPass exclude directives only exclude on match, instead of always
noted by Vasiliy Kiryanov, thanks!
ok stephan@
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/httpd/src/modules/proxy/mod_proxy.c | 6 |
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"; |