sync

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

diff --git a/CHANGES b/CHANGES
index aeb0c52b35918c6ac36aead95c233eaec8076f4b..4c5ca6cc4e954afe9d247694782c8dafb9484317 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,12 +12,6 @@ Changes with Apache 2.1.0-dev
   *) mod_ext_filter: Add the ability to filter request bodies.
      [Philipp Reisner <philipp.reisner@linbit.com>]
 
-  *) Fix NULL-pointer issue in ab when parsing an incomplete or non-HTTP
-     response. PR 21085. [Glenn Nielsen <glenn@apache.org>, André Malo]
-
-  *) Added FreeBSD directory layout. PR 21100.
-     [Sander Holthaus <info@orangexl.com>, André Malo]
-
   *) Correct the code in ap_check_cache_feshness to check max_age,
      smax_age, and expires correctly. Patch submitted by Thomas
      Castelle [Paul J. Reder]
@@ -158,6 +152,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) Added FreeBSD directory layout. PR 21100.
+     [Sander Holthaus <info@orangexl.com>, André Malo]
+
+  *) Fix NULL-pointer issue in ab when parsing an incomplete or non-HTTP
+     response. PR 21085. [Glenn Nielsen <glenn@apache.org>, André Malo]
+
   *) mod_rewrite: Perform child initialization on the rewrite log lock.
      This fixes a log corruption issue when flock-based serialization
      is used (e.g., FreeBSD).  [Jeff Trawick]