sync with 2.2.x/CHANGES

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

diff --git a/CHANGES b/CHANGES
index 4b6b6e4171016f131b5c2db322686a9ae205f127..ec68b9269413574cd4550faf1089829679308811 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -44,10 +44,6 @@ Changes with Apache 2.3.0
      AcceptMutex directive now takes an optional lockfile
      location parameter, ala SSLMutex. [Jim Jagielski]
 
-  *) Fix address-in-use startup failure caused by corruption of the list of
-     listen sockets in some configurations with multiple generic Listen
-     directives.  [Jeff Trawick]
-
   *) mod_authn_dbd: Export any additional columns queried in the SQL select
      into the environment with the name AUTHENTICATE_<COLUMN>. This brings
      mod_authn_dbd behaviour in line with mod_authnz_ldap. [Graham Leggett]
@@ -267,6 +263,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) Fix address-in-use startup failure caused by corruption of the list of
+     listen sockets in some configurations with multiple generic Listen
+     directives.  [Jeff Trawick]
+
   *) mod_proxy_balancer: Set the new environment variable BALANCER_ROUTE_CHANGED
      if a worker with a route different from the one supplied by the client
      had been chosen or if the client supplied no routing information for