Mark Bergsma has submitted this change and it was merged.
Change subject: Normalize and Vary on the forceHTTPS cookie
......................................................................
Normalize and Vary on the forceHTTPS cookie
We move most cookies out of the way since Varnish doesn't support
X-Vary-Options, but forceHTTPS we do need to vary on.
Change-Id: Ibc47e96e7725170486286def7e7c5c8f28d0c892
---
M templates/varnish/text-common.inc.vcl.erb
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
CSteipp: Looks good to me, but someone else must approve
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/text-common.inc.vcl.erb
b/templates/varnish/text-common.inc.vcl.erb
index 0710a5d..2d70db1 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -17,6 +17,11 @@
if (req.restarts == 0) {
set req.http.Orig-Cookie = req.http.Cookie;
unset req.http.Cookie;
+
+ /* We need to vary on the forceHTTPS cookie */
+ if (req.http.Orig-Cookie ~ "forceHTTPS=(1|true)") {
+ set req.http.Cookie = "forceHTTPS=1";
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/86268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc47e96e7725170486286def7e7c5c8f28d0c892
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: CSteipp <cste...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
