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 feaa29c3f5dd2067d401ac69682274b9a54ac0d9..299f2622430f28005a73006f415d0ac4cdcc07da 100644 (file)
--- 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 89b8f4152695fa206812a3018d8cd2f1339e8810..f127b6a31037e496ef1932c9e561b4d680544d91 100644 (file)
--- 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 7c8f34d373864f3c56b99d3b4f427b44cdd0a7c8..7a88ade4120a8c9ca73d8fdaf10b9a7bce361488 100644 (file)
--- 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,