From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Thu, 29 May 2008 10:40:36 +0000 (-0600)
Subject: Author: Henrik Nordstrom <henrik@henriknordstrom.net>
X-Git-Tag: SQUID_3_0_STABLE7~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39341af1b42eb6f8f6e8f16b532aa1dd6dafa6f2;p=thirdparty%2Fsquid.git

Author: Henrik Nordstrom <henrik@henriknordstrom.net>
Bug #1955: Clarify refresh_pattern override-expire option

override-expire applies to both Expires and CC max-age, but comments
only mention Expires..
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 2fd3f3675d..c44a29afb1 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -2520,9 +2520,10 @@ DOC_START
 		 refresh-ims
 
 		override-expire enforces min age even if the server
-		sent a Expires: header. Doing this VIOLATES the HTTP
-		standard.  Enabling this feature could make you liable
-		for problems which it causes.
+		sent an explicit expiry time (e.g., with the
+		Expires: header or Cache-Control: max-age). Doing this
+		VIOLATES the HTTP standard.  Enabling this feature
+		could make you liable for problems which it causes.
 
 		override-lastmod enforces min age even on objects
 		that were modified recently.