* Sync with 2.2.x STATUS file

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

diff --git a/CHANGES b/CHANGES
index fd449884251907405b94767379f90a798fd3cbbd..af8d7e611bfc2727a4b384bf70c4127d7ef4836a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,12 +15,6 @@ Changes with Apache 2.3.0
      close the connection.
      [Justin Erenkrantz, Roy T. Fielding, Jim Jagielski, Ruediger Pluem]
 
-  *) mod_ssl: Fix a possible crash during access control checks if a
-     non-SSL request is processed for an SSL vhost (such as the
-     "HTTP request received on SSL port" error message when an 400 
-     ErrorDocument is configured, or if using "SSLEngine optional").
-     PR 37791.  [Rüdiger Plüm, Joe Orton]
-
   *) mod_authz_dbd: SQL authz with Login/Session support [Nick Kew]
 
   *) Fix typo in ProxyStatus syntax error message.
@@ -54,6 +48,13 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.1
 
+  *) SECURITY: CVE-2005-3357 (cve.mitre.org)
+     mod_ssl: Fix a possible crash during access control checks if a
+     non-SSL request is processed for an SSL vhost (such as the
+     "HTTP request received on SSL port" error message when an 400 
+     ErrorDocument is configured, or if using "SSLEngine optional").
+     PR 37791.  [Rüdiger Plüm, Joe Orton]
+
   *) Chunk filter: Fix chunk filter to create correct chunks in the case that
      a flush bucket is surrounded by data buckets. [Ruediger Pluem]