Backport r239420 and r239421 to the 2.2.x branch; Enhance

CacheEnable/CacheDisable to be of use to proxy servers.

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

diff --git a/CHANGES b/CHANGES
index 24077cb6032f8de648ce2c9aed5e61277ddc80a9..c69764e59fedc15174193f337def2aa088a47569 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -35,10 +35,6 @@ Changes with Apache 2.3.0
      listening ports upon graceful restart or stop. PR 28167. 
      [Colm MacCarthaigh, Brian Pinkerton <bp thinkpink.com>]
 
-  *) mod_cache: Enhance CacheEnable/CacheDisable to control caching on a
-     per-protocol, per-host and per-path basis. Intended for proxy
-     configurations. [Colm MacCarthaigh]
-
   *) Teach mod_ssl to use arbitrary OIDs in an SSLRequire directive,
      allowing string-valued client certificate attributes to be used for
      access control, as in: SSLRequire "value" in OID("1.3.6.1.4.1.18060.1")
@@ -46,6 +42,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.8
 
+  *) mod_cache: Enhance CacheEnable/CacheDisable to control caching on a
+     per-protocol, per-host and per-path basis. Intended for proxy
+     configurations. [Colm MacCarthaigh]
+
   *) mod_disk_cache: Canonicalise the storage key, for improved hit/miss
      ratio. [Colm MacCarthaigh]