From: Eduard Bagdasaryan <dictiano@gmail.com>
Date: Tue, 19 Dec 2017 19:11:13 +0000 (+0300)
Subject: Restored Squid ability to serve pure hits broken by d816577 (#107)
X-Git-Tag: M-staged-PR71~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d6a91ba608acadb9f3cb397d72748a711db3c91;p=thirdparty%2Fsquid.git

Restored Squid ability to serve pure hits broken by d816577 (#107)

Since PR #79, most incoming objects got wrong served_date, becoming
immediately stale, and usually requiring revalidation.
---

diff --git a/src/store.cc b/src/store.cc
index 4736da26cd..bd3d57a458 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1554,9 +1554,8 @@ StoreEntry::timestampsSet()
     // compensate for Squid-to-server and server-to-Squid delays
     if (mem_obj && mem_obj->request) {
         struct timeval responseTime;
-        if (mem_obj->request->hier.peerResponseTime(responseTime) &&
-                responseTime.tv_sec < squid_curtime)
-            served_date -= (squid_curtime - responseTime.tv_sec);
+        if (mem_obj->request->hier.peerResponseTime(responseTime))
+            served_date -= responseTime.tv_sec;
     }
 
     time_t exp = 0;