sync

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

diff --git a/CHANGES b/CHANGES
index 6e98e6e74543e4ea84ece49f154689d28abf7dac..bc32a7c30ee79e4e155efbb47c9ede24fae31579 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
+
   *) proxy_http fix: mod_proxy hangs when both KeepAlive and 
      ProxyErrorOverride are enabled, and a non-200 response without a 
      body is generated by the backend server. (e.g.: a client makes a 
@@ -126,10 +127,6 @@ Changes with Apache 2.1.0-dev
   *) mod_rewrite: RewriteRules in server context using the force
      type feature [T=...] no longer disable MultiViews.  [André Malo]
 
-  *) mod_rewrite: In external rewrite maps lookup keys containing
-     a newline now cause a lookup failure. PR 14453.
-     [Cedric Gavage <cedric.gavage unixtech.be>, André Malo]
-
   *) mod_rewrite: Allow piped rewrite logs to be relative to ServerRoot.
      [André Malo]
 
@@ -265,6 +262,16 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_rewrite: In external rewrite maps lookup keys containing
+     a newline now cause a lookup failure. PR 14453.
+     [Cedric Gavage <cedric.gavage unixtech.be>, André Malo]
+
+  *) Backport major overhaul of mod_include's filter parser from 2.1.
+     The new parser code is expected to be more robust and should
+     catch all of the edge cases that were not handled by the previous one.
+     The 2.1 external API changes were hidden by a wrapper which is
+     expected to keep the API backwards compatible.  [André Malo]
+
   *) Add a hook (insert_error_filter) to allow filters to re-insert
      themselves during processing of error responses. Enable mod_expires
      to use the new hook to include Expires headers in valid error