Sync changes

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

diff --git a/CHANGES b/CHANGES
index e2ca27187d750c502177001f2120958ae2ace0a6..dea0db1dd376a1510416ceb1d530e46ba122afb1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,12 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) Move mod_dbd to /modules/database/ [Nick Kew]
-
-  *) Move mod_filter and mod_charset_lite to /modules/filters/ [Nick Kew]
-
-  *) Fix mod_dbd's config [Brian J. France <list firehawksystems.com>]
-
   *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
      in 1.3.  [Jeff Trawick]
 
@@ -24,6 +18,14 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.9
 
+  *) Support dbd connections tied to the conn_rec [Nick Kew]
+
+  *) Move mod_dbd to /modules/database/ [Nick Kew]
+
+  *) Move mod_filter and mod_charset_lite to /modules/filters/ [Nick Kew]
+
+  *) Fix mod_dbd's config [Brian J. France <list firehawksystems.com>]
+
   *) mod_proxy_ajp: mod_proxy_ajp sends empty SSL attributes for non SSL
      connections. PR36883.
      [William Barker <william.barker wilshire.com>, Ruediger Pluem]