From: Graham Leggett <minfrin@apache.org>
Date: Sat, 23 Oct 2004 13:41:18 +0000 (+0000)
Subject: Note a backport
X-Git-Tag: 2.1.1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d12917631cd6812fc7b2c081f606ac35155209bb;p=thirdparty%2Fapache%2Fhttpd.git

Note a backport
PR:
Obtained from:
Submitted by:
Reviewed by:


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

diff --git a/CHANGES b/CHANGES
index 126f71c26c6..20ea0a512a7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,10 +5,6 @@ Changes with Apache 2.1.0-dev
   *) WIN64: API changes to clean up Windows 64bit compile warnings
      [Allan Edwards]
 
-  *) mod_cache: CacheDisable will only disable the URLs it was meant to 
-     disable, not all caching. PR 31128.
-     [Edward Rudd <eddie omegaware.com>, Paul Querna]
-
   *) mod_ldap: Fix format strings to use %APR_PID_T_FMT instead of %d.
      [Jeff Trawick]
 
@@ -422,6 +418,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.53
 
+  *) mod_cache: CacheDisable will only disable the URLs it was meant to 
+     disable, not all caching. PR 31128.
+     [Edward Rudd <eddie omegaware.com>, Paul Querna]
+
   *) mod_cache: Try to correctly follow RFC 2616 13.3 on validating stale
      cache responses.  [Justin Erenkrantz]