From: Jim Jagielski <jim@apache.org>
Date: Wed, 14 Jun 2017 11:14:20 +0000 (+0000)
Subject: smash dup
X-Git-Tag: 2.4.27~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2338031f33c0303e6021659c222e55ad3039454a;p=apache

smash dup


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

diff --git a/CHANGES b/CHANGES
index d97239f384..a1f04d6c6e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -125,11 +125,6 @@ Changes with Apache 2.4.26
      variables just before invoking the FastCGI. [Eric Covener,
      Jacob Champion]
 
-  *) 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.
-    Use SetEnvIf, not SetEnv. [Eric Covener]
-
   *) mod_proxy_fcgi: Return to 2.4.20-and-earlier behavior of leaving
      a "proxy:fcgi://" prefix in the SCRIPT_FILENAME environment variable by
      default.  Add ProxyFCGIBackendType to allow the type of backend to be