From: Barry Dobyns <barry@dobyns.com>
Date: Sat, 27 Aug 2011 07:43:33 +0000 (-0600)
Subject: Bug 1791: timestampsSet does not validate Date: if server sends very old date
X-Git-Tag: SQUID_3_1_15~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f97b5b84696a0deff0dafd9ed7f7d7c8fb2cb02;p=thirdparty%2Fsquid.git

Bug 1791: timestampsSet does not validate Date: if server sends very old date
---

diff --git a/src/store.cc b/src/store.cc
index be313eb331..c1c2b7b232 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1493,6 +1493,14 @@ StoreEntry::timestampsSet()
     if (served_date < 0 || served_date > squid_curtime)
         served_date = squid_curtime;
 
+    /* Bug 1791:
+     * If the returned Date: is more than 24 hours older than
+     * the squid_curtime, then one of us needs to use NTP to set our
+     * clock.  We'll pretend that our clock is right.
+     */
+    else if (served_date < (squid_curtime - 24 * 60 * 60) )
+        served_date = squid_curtime;
+
     /*
      * Compensate with Age header if origin server clock is ahead
      * of us and there is a cache in between us and the origin