Backported

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

diff --git a/CHANGES b/CHANGES
index 0e66f9e3f9c28d290dc030df98b3c6a04fdf528f..d1311dde84eee78473ec0fc240fcfc7a52d8b98b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) mod_cache: Let Cache-Control max-age set the expiration of the cached
-     representation if Expires is not set.  [Justin Erenkrantz]
-
   *) mod_so: Solve dev's confusion by reporting expected/seen module
      magic signatures when failing with a 'garbled' message, and solve
      user's confusion by pointing out 'perhaps compiled for a different
@@ -252,6 +249,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.5
 
+  *) mod_cache: Let Cache-Control max-age set the expiration of the cached
+     representation if Expires is not set.  [Justin Erenkrantz]
+
   *) mod_disk_cache: Allow Vary'd responses to be refreshed properly.
      [Justin Erenkrantz]