Mark Bergsma has submitted this change and it was merged.

Change subject: req.hash_ignore_busy can't be set from vcl_hash for some reason
......................................................................


req.hash_ignore_busy can't be set from vcl_hash for some reason

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

Approvals:
  Mark Bergsma: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/varnish/text-backend.inc.vcl.erb 
b/templates/varnish/text-backend.inc.vcl.erb
index bbe113f..1bad43d 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -20,11 +20,9 @@
 <% end -%>
        call pass_requests;
 
-       return(lookup);
-}
-
-sub vcl_hash {
        call evaluate_cookie;
+
+       return(lookup);
 }
 
 sub vcl_pass {
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 58ce408..623752a 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -47,11 +47,9 @@
                unset req.http.If-Modified-Since;
        }
 
-       return(lookup);
-}
-
-sub vcl_hash {
        call evaluate_cookie;
+
+       return(lookup);
 }
 
 sub vcl_pass {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I55c1858d3b57842961028bd24ac6f31a17d151fb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@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

Reply via email to