From: wessels <>
Date: Mon, 19 Oct 1998 10:40:30 +0000 (+0000)
Subject: clear no-cache bit for cache hits on STORE_PENDING entries
X-Git-Tag: SQUID_3_0_PRE1~2545
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b95ce494396277f034f1038bc3a5127138b2e3f;p=thirdparty%2Fsquid.git

clear no-cache bit for cache hits on STORE_PENDING entries
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 3bde962d64..605e51c430 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.417 1998/10/18 08:10:05 wessels Exp $
+ * $Id: client_side.cc,v 1.418 1998/10/19 04:40:30 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1656,7 +1656,7 @@ clientProcessOnlyIfCachedMiss(clientHttpRequest * http)
 static log_type
 clientProcessRequest2(clientHttpRequest * http)
 {
-    const request_t *r = http->request;
+    request_t *r = http->request;
     StoreEntry *e;
     e = http->entry = storeGetPublic(http->uri, r->method);
     if (r->method == METHOD_HEAD && e == NULL) {
@@ -1694,6 +1694,11 @@ clientProcessRequest2(clientHttpRequest * http)
 	ipcacheReleaseInvalid(r->host);
 	/* continue! */
     }
+    if (r->flags.nocache && e->store_status == STORE_PENDING) {
+	debug(33, 3) ("Clearing no-cache for STORE_PENDING request\n\t%s\n",
+	    storeUrl(e));
+	r->flags.nocache = 0;
+    }
 #endif
     if (r->flags.nocache) {
 	debug(33, 3) ("clientProcessRequest2: no-cache REFRESH MISS\n");