these are backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796451 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 9d8833f4f46c9edd78ae6e1be266682c2009ae03..fe14268a922f2552b8bc3e51b8e5b950180cf5d8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -35,11 +35,6 @@ Changes with Apache 2.5.0
      a possible crash if a signal is caught during (graceful) restart.
      PR 60487.  [Yann Ylavic]
   
-  *) 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]
-
   *) When using mod_status with the Event MPM, report the number of requests
      associated with an active connection in the "ACC" field. Previously
      zero was always reported with this MPM.  PR60647. [Eric Covener]
@@ -52,9 +47,6 @@ Changes with Apache 2.5.0
      specified so these kinds of fixups can be restored without impacting
      FPM. PR60576 [Eric Covener, Jim Jagielski]
 
-  *) core: EBCDIC fixes for interim responses with additional headers.
-     [Eric Covener]
-
   *) mod_remoteip: Add support for PROXY protocol (code donated by Cloudzilla).
      Add ability for PROXY protocol processing to be optional to donated code.
      See also: http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt