From: Jim Jagielski <jim@apache.org>
Date: Wed, 29 Mar 2017 17:13:52 +0000 (+0000)
Subject: Merge r1781328, r1785907 from trunk:
X-Git-Tag: 2.4.26~195
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fc24d045dd057ff4aec31b6d62d1047db1ed0f2;p=apache

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 58266ee79b..0a2ff28364 100644
--- 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)