From: Graham Leggett <minfrin@apache.org>
Date: Sat, 23 Oct 2004 13:40:11 +0000 (+0000)
Subject: mod_cache: use the correct struct for CacheDisable.
X-Git-Tag: 2.0.53~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9675c865e22a0e9643ae7d2bbf6555f7e9803ed;p=thirdparty%2Fapache%2Fhttpd.git

mod_cache: use the correct struct for CacheDisable.
Currently any use of CacheDisable disables all caching.
PR:	31128
Obtained from:
Submitted by:	Edward Rudd <eddie omegaware.com>, Paul Querna
Reviewed by:	pquerna, stoddard, jerenkrantz


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

diff --git a/CHANGES b/CHANGES
index feaa29c3f5d..299f2622430 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 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]
 
diff --git a/STATUS b/STATUS
index 89b8f415269..f127b6a3103 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/10/22 19:00:37 $]
+Last modified at [$Date: 2004/10/23 13:40:10 $]
 
 Release:
 
@@ -75,12 +75,6 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
-    *) mod_cache: use the correct struct for CacheDisable.
-       Currently any use of CacheDisable disables all caching. 
-       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/experimental/mod_cache.c?r1=1.93&r2=1.94
-       PR: 31128
-       +1: pquerna, stoddard, jerenkrantz
-
     *) mod_ldap: Fix format strings to use %APR_PID_T_FMT instead of %d.
          modules/ldap/util_ldap.c: 1.16
        +1: minfrin, pquerna, bnicholes
diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c
index 7c8f34d3738..7a88ade4120 100644
--- a/modules/experimental/mod_cache.c
+++ b/modules/experimental/mod_cache.c
@@ -802,7 +802,7 @@ static const char *add_cache_disable(cmd_parms *parms, void *dummy,
                                      const char *url)
 {
     cache_server_conf *conf;
-    struct cache_enable *new;
+    struct cache_disable *new;
 
     conf =
         (cache_server_conf *)ap_get_module_config(parms->server->module_config,