* CHANGES

  Update to reflect changes on 2.0.x due to backports.

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

diff --git a/CHANGES b/CHANGES
index cc9d5235825e87b10a657e69f16cfde7cd6ab1a6..839751dce113c4758d10a8b2f745c569dc88b775 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -243,9 +243,6 @@ Changes with Apache 2.1.1
   *) core: Add a warning message if the request line read fails.
      [Paul Querna]
 
-  *) mod_cache: Add CacheIgnoreHeaders directive.  PR 30399.
-     [Rüiger Plü <r.pluem t-online.de>]
-
   *) mod_rewrite: Removed the MaxRedirects option in favor of the
      core LimitInternalRecursion directive.  [André Malo]
 
@@ -645,6 +642,9 @@ Changes with Apache 2.1.1
 
 Changes with Apache 2.0.54
 
+  *) mod_cache: Add CacheIgnoreHeaders directive.  PR 30399.
+     [Rüiger Plü <r.pluem t-online.de>]
+
   *) mod_ldap: Added the directive LDAPConnectionTimeout to configure
      the ldap socket connection timeout value.  
      [Brad Nicholes]
@@ -659,6 +659,9 @@ Changes with Apache 2.0.54
      were escaped as fallout from CAN-2003-0020.
      [Eric Covener <ecovener gmail.com>]
 
+  *) mod_ssl: If SSLUsername is used, set r->user earlier.  PR 31418.
+     [David Reid]
+
   *) htdigest: Fix permissions of created files.  PR 33765.  [Joe Orton]
 
   *) core_input_filter: Move buckets to a persistent brigade instead of