From: Stewart Forster <slf@connect.com.au>

The following patches do some cosmetic changes (REQ_NOCACHE_HACK ->
REQ_NOCACHE_IMS), and introduce a new check into refreshCheck to force an
IMS refresh check if REQ_NOCACHE_IMS is set.

diff --git a/src/client_side.cc b/src/client_side.cc
index f3a6e828503ed528073095867441753a33c2026a..ca48c263bdad143b0b20bce3374fbd338c6820f5 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.381 1998/08/17 18:48:59 wessels Exp $
+ * $Id: client_side.cc,v 1.382 1998/08/17 19:19:33 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -683,7 +683,7 @@ clientInterpretRequestHeaders(clientHttpRequest * http)
            if (!Config.onoff.reload_into_ims)
                EBIT_SET(request->flags, REQ_NOCACHE);
            else
-               EBIT_SET(request->flags, REQ_NOCACHE_HACK);
+               EBIT_SET(request->flags, REQ_NOCACHE_IMS);
        }
        stringClean(&s);
     }

diff --git a/src/enums.h b/src/enums.h
index 055e12db1d8017f845774dc8e5026de306cc7bee..eaff66dfff573e490519bea6dc09f8c2b92b8580 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.116 1998/08/17 18:49:00 wessels Exp $
+ * $Id: enums.h,v 1.117 1998/08/17 19:19:34 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -473,7 +473,7 @@ enum {
     REQ_REFRESH,
     REQ_USED_PROXY_AUTH,
     REQ_REDIRECTED,
-    REQ_NOCACHE_HACK           /* for changing no-cache requests into IMS */
+    REQ_NOCACHE_IMS            /* for changing no-cache requests into IMS */
 };
 
 enum {

diff --git a/src/refresh.cc b/src/refresh.cc
index 3c0a8a9c95a5e03e78d454aa0f99fc3a97c8f8ad..d54419ec97b2f711eaebdcb31a2f93f9f342ab80 100644 (file)
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: refresh.cc,v 1.29 1998/08/11 19:18:37 wessels Exp $
+ * $Id: refresh.cc,v 1.30 1998/08/17 19:19:35 wessels Exp $
  *
  * DEBUG: section 22    Refresh Calculation
  * AUTHOR: Harvest Derived
@@ -115,6 +115,11 @@ refreshCheck(const StoreEntry * entry, request_t * request, time_t delta)
        refreshCounts.revalidate_stale++;
        return 1;
     }
+    if (EBIT_TEST(request->flags, REQ_NOCACHE_IMS)) {
+       debug(22, 3) ("refreshCheck: YES: Reload into IMS\n");
+       refreshCounts.revalidate_stale++;
+       return 1;
+    }
     if ((R = refreshLimits(uri))) {
        min = R->min;
        pct = R->pct;