* Sync with 2.2.x CHANGES

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

diff --git a/CHANGES b/CHANGES
index 525ec7b5ff10f5a6e374e143fa204e45117bbb77..c198a5c5dbd682f78959abfe6b39c2fe9122f82a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,16 +11,6 @@ Changes with Apache 2.3.0
   *) htdbm: Fix crash processing -d option in 64-bit mode on HP-UX.
      [Jeff Trawick]
 
-  *) htdbm: Warn the user when adding a plaintext password on a platform
-     where it wouldn't work with the server (i.e., anywhere that has
-     crypt()).  [Jeff Trawick]
-
-  *) mod_proxy: Forward proxy requests created by mod_rewrite to the correct
-     backend server. PR 39253. [Ruediger Pluem]
-
-  *) Default handler: Don't return output filter apr_status_t values.
-     PR 31759.  [Jeff Trawick, Ruediger Pluem, Joe Orton]
-
   *) Event MPM: Fill in the scoreboard's tid field. PR 38736.
      [Chris Darroch <chrisd pearsoncmg.com>]
 
@@ -34,9 +24,6 @@ Changes with Apache 2.3.0
   *) Respect GracefulShutdownTimeout in the worker and event MPMs.
      [Chris Darroch <chrisd pearsoncmg.com>, Garrett Rooney]
 
-  *) core: Reject invalid Expect header immediately. PR 38123.
-     [Ruediger Pluem]
-
   *) Authz: Add the new module mod_authn_core that will provide common
      authn directives such as 'AuthType', 'AuthName'.  Move the directives
      'AuthType' and 'AuthName' out of the core module and merge mod_authz_alias 
@@ -101,6 +88,18 @@ Changes with Apache 2.3.0
      access control, as in: SSLRequire "value" in OID("1.3.6.1.4.1.18060.1")
      [Martin Kraemer, David Reid]
 
+Changes with Apache 2.2.2
+
+  *) htdbm: Warn the user when adding a plaintext password on a platform
+     where it wouldn't work with the server (i.e., anywhere that has
+     crypt()).  [Jeff Trawick]
+
+  *) mod_proxy: don't reuse a connection that may be to the wrong backend
+     PR 39253 [Ruediger Pluem]
+
+  *) Default handler: Don't return output filter apr_status_t values.
+     PR 31759.  [Jeff Trawick, Ruediger Pluem, Joe Orton]
+
 Changes with Apache 2.2.1
 
   *) SECURITY: CVE-2005-3357 (cve.mitre.org)