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 c10d02f554033ef6bbc55fa6b17648e6da8b50e8..64ea16d6959ccedffcfddac4ee3f9c0bb7b4fb37 100644 (file)
--- 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]