From: wessels <>
Date: Tue, 5 Nov 1996 00:02:49 +0000 (+0000)
Subject:         - Fixed checkRefresh() to not cause IMS request for objects
X-Git-Tag: SQUID_3_0_PRE1~5538
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34308e0fbfbbcd5e267a50d6375ecf43f09b879c;p=thirdparty%2Fsquid.git

    - Fixed checkRefresh() to not cause IMS request for objects
          which have not yet expired, but are past the LM-factor.
---

diff --git a/src/refresh.cc b/src/refresh.cc
index c40dc1ce20..030b66d697 100644
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: refresh.cc,v 1.2 1996/10/28 07:44:25 wessels Exp $
+ * $Id: refresh.cc,v 1.3 1996/11/04 17:02:49 wessels Exp $
  *
  * DEBUG: section 22    Refresh Calculation
  * AUTHOR: Harvest Derived
@@ -138,9 +138,14 @@ refreshCheck(StoreEntry * entry, request_t * request_unused)
 	debug(22, 3, "refreshCheck: NO: age < min\n");
 	return 0;
     }
-    if (-1 < entry->expires && entry->expires <= squid_curtime) {
-	debug(22, 3, "refreshCheck: YES: expires <= curtime\n");
-	return 1;
+    if (-1 < entry->expires) {
+	if (entry->expires <= squid_curtime) {
+	    debug(22, 3, "refreshCheck: YES: expires <= curtime\n");
+	    return 1;
+	} else {
+	    debug(22, 3, "refreshCheck: NO: expires > curtime\n");
+	    return 0;
+	}
     }
     if (age > max) {
 	debug(22, 3, "refreshCheck: YES: age > max\n");