]> granicus.if.org Git - apache/commit
Merge r1773397 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 12 Dec 2016 15:20:04 +0000 (15:20 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 12 Dec 2016 15:20:04 +0000 (15:20 +0000)
commitbb85ed16453629b03e478d33dbe2a2439232c9bf
tree700d19f65553fffe844bc3e7286f9328d0c3b346
parent23c3e7cf142df85f130a4234a3bc40effa0b1c7c
Merge r1773397 from trunk:

ProxyPass ! doesn't block per-directory ProxyPass

 *) mod_proxy: Honor a server scoped ProxyPass exception when ProxyPass is
     configured in <Location>, like in 2.2. PR 60458.
     [Eric Covener]

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1773800 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/proxy/mod_proxy.c