svn commit: r368887 - /httpd/httpd/trunk/CHANGES

[rp...@apache.org]

Author: rpluem
Date: Fri Jan 13 14:37:51 2006
New Revision: 368887

URL: http://svn.apache.org/viewcvs?rev=368887&view=rev
Log:
* Sync with 2.2.x STATUS file

Modified:
    httpd/httpd/trunk/CHANGES

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=368887&r1=368886&r2=368887&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Jan 13 14:37:51 2006
@@ -15,12 +15,6 @@
      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.
@@ -53,6 +47,13 @@
      [Martin Kraemer, David Reid]
 
 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� Pl�e Orton]
 
   *) Chunk filter: Fix chunk filter to create correct chunks in the case that
      a flush bucket is surrounded by data buckets. [Ruediger Pluem]