From: Eric Covener <covener@apache.org>
Date: Sat, 1 Mar 2014 18:34:25 +0000 (+0000)
Subject: backported
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a0468b3b362ba5e062ff131c4eddf1e9a42c749;p=thirdparty%2Fapache%2Fhttpd.git

backported



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

diff --git a/CHANGES b/CHANGES
index c10d02f5540..64ea16d6959 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,18 +4,9 @@ Changes with Apache 2.5.0
   *) mod_ssl: Do not perform SNI / Host header comparison in case of a
      forward proxy request. [Ruediger Pluem]
 
-  *) mod_rewrite: Add RewriteOptions InheritDown, InheritDownBefore, 
-     and IgnoreInherit to allow RewriteRules to be pushed from parent scopes
-     to child scopes without explicitly configuring each child scope.
-     PR56153.  [Edward Lu <Chaosed0 gmail com>] 
-
   *) mod_lua: Add r:wspeek for checking if there is any data waiting on the line
      [Daniel Gruno]
 
-  *) mod_proxy_wstunnel: Avoid busy loop on client errors, drop message
-     IDs 02445, 02446, and 02448 to TRACE1 from DEBUG. PR 56145.
-     [Joffroy Christen <joffroy.christen solvaxis com>, Eric Covener]
-
   *) mod_proxy: Do not try to parse the regular expressions passed by
      ProxyPassMatch as URL as they do not follow their syntax.
      PR 56074. [Ruediger Pluem]