From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 27 Jun 2010 09:35:30 +0000 (+1200)
Subject: Author: Robert Collins <robertc@robertcollins.net>
X-Git-Tag: SQUID_3_1_5~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27e6d53a67ff603895b3f98e4c467e48825ccd87;p=thirdparty%2Fsquid.git

Author: Robert Collins <robertc@robertcollins.net>
Bug 2950: HTTP responses with no Date, L-M or Expires can now be cached

HTTP responses with no Date, Last-modified or Expires headers can
now be cached (given an appropriate refresh_pattern). Previously we
were not caching them in case of an infinite loop in cache farms:
however Squid adds Date: headers now which remove that concern.
---

diff --git a/src/http.cc b/src/http.cc
index e8f4f259ce..e213082930 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -444,23 +444,9 @@ HttpStateData::cacheableReply()
         if (!refreshIsCachable(entry)) {
             debugs(22, 3, "refreshIsCachable() returned non-cacheable..");
             return 0;
-        }
-
-        /* don't cache objects from peers w/o LMT, Date, or Expires */
-        /* check that is it enough to check headers @?@ */
-        if (rep->date > -1)
-            return 1;
-        else if (rep->last_modified > -1)
-            return 1;
-        else if (!_peer)
+        } else
             return 1;
 
-        /* @?@ (here and 302): invalid expires header compiles to squid_curtime */
-        else if (rep->expires > -1)
-            return 1;
-        else
-            return 0;
-
         /* NOTREACHED */
         break;