sync

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

diff --git a/CHANGES b/CHANGES
index b2b31f361d00883ce0cd6d89c4b35db62e6fc074..a7dc0e6c19356d277d685b31da22945f0056bfe0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -49,12 +49,6 @@ Changes with Apache 2.1.0-dev
   *) mod_rewrite: Cookie creation now works locale independent.
      [André Malo]
 
-  *) mod_usertrack no longer inspects the Cookie2 header for
-     the cookie name. PR 11475.  [Chris Darrochi <chrisd pearsoncmg.com>]
-
-  *) mod_usertrack no longer overwrites other cookies.
-     PR 26002.  [Scott Moore <apache nopdesign.com>]
-
   *) proxy_http fix: mod_proxy hangs when both KeepAlive and 
      ProxyErrorOverride are enabled, and a non-200 response without a 
      body is generated by the backend server. (e.g.: a client makes a 
@@ -291,6 +285,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_usertrack no longer inspects the Cookie2 header for
+     the cookie name. PR 11475.  [Chris Darrochi <chrisd pearsoncmg.com>]
+
+  *) mod_usertrack no longer overwrites other cookies.
+     PR 26002.  [Scott Moore <apache nopdesign.com>]
+
   *) worker MPM: fix stack overlay bug that could cause the parent
      process to crash.  [Jeff Trawick]