Make no_cache bypass the cache, not only stop content from being cached.

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 91d0fc9688a5459d96dafc622c0abf5f48dcb869..62982d6e7842f47eb2bb65723fb1c31df72248e3 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.238 2001/10/22 14:40:23 hno Exp $
+# $Id: cf.data.pre,v 1.239 2001/11/13 06:38:27 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -508,9 +508,9 @@ TYPE: acl_access
 DEFAULT: none
 LOC: Config.accessList.noCache
 DOC_START
-       A list of ACL elements which, if matched, cause the reply to
-       immediately removed from the cache.  In other words, use this
-       to force certain objects to never be cached.
+       A list of ACL elements which, if matched, cause the request to
+       not be satisfied from the cache and the reply to not be cached.
+       In other words, use this to force certain objects to never be cached.
 
        You must use the word 'DENY' to indicate the ACL names which should
        NOT be cached.

diff --git a/src/client_side.cc b/src/client_side.cc
index c4835fecaec7eff94f7bf6ef9cf1098b9b862a6a..5debaeb0108907543fdd0244086ea1c562687094 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.556 2001/10/26 23:11:56 hno Exp $
+ * $Id: client_side.cc,v 1.557 2001/11/13 06:38:27 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2187,7 +2187,10 @@ clientProcessRequest2(clientHttpRequest * http)
 {
     request_t *r = http->request;
     StoreEntry *e;
-    e = http->entry = storeGetPublicByRequest(r);
+    if (r->flags.cachable)
+       e = http->entry = storeGetPublicByRequest(r);
+    else
+       e = http->entry = NULL;
     /* Release negatively cached IP-cache entries on reload */
     if (r->flags.nocache)
        ipcacheInvalidate(r->host);