From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Mon, 26 May 2008 22:28:50 +0000 (+0200)
Subject: Bug #1955: Clarify refresh_pattern override-expire option
X-Git-Tag: SQUID_3_1_0_1~49^2~222
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b2ad08041ed6562de3254dec732b6ebf1a1f034;p=thirdparty%2Fsquid.git

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 da98a127f3..990c315b69 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -2736,9 +2736,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.