Merge r1781328, r1785907 from trunk:

add no-proxy envvar for mod_proxy

replacement for ProxyPass /path ! when ProxyPass is in
location context.

compat inline for no-proxy

Submitted by: covener
Reviewed by: covener, ylavic, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789392 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 58266ee79b4b780828ac7cc8a3a89592146e371d..0a2ff2836473830eb03f57fc870304023cc36975 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -118,14 +118,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy: Allow the per-request environment variable "no-proxy" to
-     be used as an alternative to ProxyPass /path !. This is primarily
-     to set exceptions for ProxyPass specified in <Location> context.
-     trunk patch: http://svn.apache.org/r1781328
-                  http://svn.apache.org/r1785907
-     2.4.x patch: trunk works
-     +1: covener, ylavic, jim
-
   *) Easy patches: synch 2.4.x and trunk
      - cache: Use apr_pstrmemdup instead of apr_pstrndup when applicable
      - cache: Remove a useless break + tiny style fix (missing space)