BBlack has submitted this change and it was merged.
Change subject: Drop vestige of SPDY support detection from VCL
......................................................................
Drop vestige of SPDY support detection from VCL
Change-Id: If52b2e892f681c426c6442020a06a9fd1a5c1aea
---
M modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
b/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
index c62be3e..12f4b3f 100644
--- a/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
@@ -338,12 +338,12 @@
std.collect(resp.http.X-Varnish);
// Set CP ('Connection Properties') cookie
- if (req.http.X-Connection-Properties ~ "SPDY=3|H2=1") {
+ if (req.http.X-Connection-Properties ~ "H2=1") {
if (req.http.X-Orig-Cookie !~ "(^|;\s*)CP=H2" &&
req.http.Cookie !~ "(^|;\s*)CP=H2") {
header.append(resp.http.Set-Cookie, "CP=H2; Path=/;
secure");
}
} else {
- // Explicitly unset the cookie if it exists. Support for SPDY
in a browser session can
+ // Explicitly unset the cookie if it exists. Support for HTTP/2
in a browser session can
// flip if a device moves networks and thus behind a proxy.
if (req.http.X-Orig-Cookie ~ "(^|;\s*)CP=H2" || req.http.Cookie
~ "(^|;\s*)CP=H2") {
header.append(resp.http.Set-Cookie, "CP=H1;
Expires=Thu, 01-Jan-1970 00:00:01 GMT; Path=/; secure");
--
To view, visit https://gerrit.wikimedia.org/r/294017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If52b2e892f681c426c6442020a06a9fd1a5c1aea
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
