Mark Bergsma has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/75588


Change subject: Restore cookies on pass requests as well, to be sure.
......................................................................

Restore cookies on pass requests as well, to be sure.

It's easy to miss this when a pass request is issued after
cookie munging.

Change-Id: If992028058b4ac1fe72da74b50190967ab618510
---
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/75588/1

diff --git a/templates/varnish/text-backend.inc.vcl.erb 
b/templates/varnish/text-backend.inc.vcl.erb
index 35501d2..efd8962 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -32,6 +32,12 @@
        return(lookup);
 }
 
+sub vcl_pass {
+       if (req.http.Orig-Cookie) {
+               call restore_cookie;
+       }
+}
+
 sub vcl_miss {
        call restore_cookie;
 }
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 0a4487b..a944747 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -49,6 +49,12 @@
        return(lookup);
 }
 
+sub vcl_pass {
+       if (req.http.Orig-Cookie) {
+               call restore_cookie;
+       }
+}
+
 sub vcl_miss {
        call restore_cookie;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/75588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If992028058b4ac1fe72da74b50190967ab618510
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to