sync with 2.2.x branch

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

diff --git a/CHANGES b/CHANGES
index 3c0a93eb42cfac9c66480e939281f7877190c6ca..c561ace1a0aea85d237ea3473c30e4b621cc7831 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -84,10 +84,6 @@ Changes with Apache 2.3.0
   *) mod_proxy: Print the correct error message for erroneous configured
      ProxyPass directives. PR 40439. [serai lans-tv.com]
 
-  *) Allow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util
-     statically like the older support programs.
-     [Eric Covener <covener gmail.com>]
-
   *) ap_get_server_version() has been removed.  Third-party modules must 
      now use ap_get_server_banner() or ap_get_server_description().
      [Jeff Trawick]
@@ -230,6 +226,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) Allow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util
+     statically like the older support programs.
+     [Eric Covener <covener gmail.com>]
+
   *) core: Fix NONBLOCK status of listening sockets on restart/graceful
      PR 37680.  [Darius Davis <darius-abz free-range.com.au>]