Reflect some backported patches.

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

diff --git a/CHANGES b/CHANGES
index 9df1ced3e3c5590b2a74704c162ffec69ece280e..ea74465fb45ca13a5af6bff7176cce72d0299ae1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -31,12 +31,6 @@ Changes with Apache 2.1.0-dev
   *) Allow restart of httpd to occur even with syntax errors in the config
      file.  PR 16813.  [Justin Erenkrantz]
 
-  *) Rewrite ap_xml_parse_input to use bucket brigades.  PR 16134.
-     [Justin Erenkrantz]
-
-  *) Fix potential memory leaks in mod_deflate on malformed data.  PR 16046.
-     [Justin Erenkrantz]
-
   *) Use APR_LAYOUT instead of APACHE_LAYOUT in configure.  PR 15679.
      [Justin Erenkrantz]
 
@@ -136,6 +130,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.45
 
+  *) Fix potential memory leaks in mod_deflate on malformed data.  PR 16046.
+     [Justin Erenkrantz]
+
+  *) Rewrite ap_xml_parse_input to use bucket brigades.  PR 16134.
+     [Justin Erenkrantz]
+
   *) Fix segfault which occurred when a section in an included
      configuration file was not closed. PR 17093.  [André Malo]