BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/293212
Change subject: text VCL: fixup hfp for X-Cache-Int
......................................................................
text VCL: fixup hfp for X-Cache-Int
Change-Id: Ia7e6bbebd304ff4393668fa5f0fd3de3a08c7110
---
M templates/varnish/text-common.inc.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/293212/1
diff --git a/templates/varnish/text-common.inc.vcl.erb
b/templates/varnish/text-common.inc.vcl.erb
index 07bfd0a..7735157 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -130,7 +130,7 @@
// avoids us accidentally replacing a good stale/grace object with
// an hfp (and then repeatedly passing on potentially-cacheable
// content) due to an isolated 5xx response, and the exception for
- // underlying cache hits (detected from X-Cache) is to avoid
+ // underlying cache hits (detected from X-Cache-Int) is to avoid
// creating a persist HFP object when a lower-level varnish
// returned an expired object under grace-mode rules.
// 2) Token=1 + Vary:Cookie
@@ -142,7 +142,7 @@
(
beresp.ttl <= 0s
&& beresp.status < 500
- && (!beresp.http.X-Cache || beresp.http.X-Cache !~ " hit\(")
+ && (!beresp.http.X-Cache-Int || beresp.http.X-Cache-Int !~ "
hit")
) || (
req.http.Cookie == "Token=1"
&& beresp.http.Vary ~ "(?i)(^|,)\s*Cookie\s*(,|$)"
--
To view, visit https://gerrit.wikimedia.org/r/293212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7e6bbebd304ff4393668fa5f0fd3de3a08c7110
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
