]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Restored Squid ability to serve pure hits broken by d816577 (#107)
authorEduard Bagdasaryan <dictiano@gmail.com>
Tue, 19 Dec 2017 19:11:13 +0000 (22:11 +0300)
committerAmos Jeffries <yadij@users.noreply.github.com>
Wed, 10 Jan 2018 09:08:08 +0000 (22:08 +1300)
Since PR #79, most incoming objects got wrong served_date, becoming
immediately stale, and usually requiring revalidation.

src/store.cc

index 69a16a19d1d62bf8c2b034d58f24d718355d9468..4cabfa456eb997ff03cc0929df66890bd81b6e68 100644 (file)
@@ -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;