BBlack has submitted this change and it was merged.

Change subject: Text VCL: support testwiki for /static/, too
......................................................................


Text VCL: support testwiki for /static/, too

Due to the ordering here, test.wikipedia.org's req.http.host was
getting changed for /static/ requests before it was checked to set
X-Wikimedia-Debug.

Change-Id: I63adc5dcbf6a39e078c85e5d19e29975d0b974dc
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 4b7103f..acbf29c 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -114,13 +114,13 @@
 
        call mobile_redirect;
 
-       # normalize all /static to the same hostname for caching
-       if (req.url ~ "^/static/") { set req.http.host = "<%= 
@vcl_config.fetch("static_host") %>"; }
-
        if (req.http.host ~ "^test\.") {
                set req.http.X-Wikimedia-Debug = "1";
        }
 
+       # normalize all /static to the same hostname for caching
+       if (req.url ~ "^/static/") { set req.http.host = "<%= 
@vcl_config.fetch("static_host") %>"; }
+
        // Users that just logged out, should not get a 304 for their
        // (locally cached) logged in pages.
        if (req.http.If-Modified-Since && req.http.Cookie ~ "LoggedOut") {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63adc5dcbf6a39e078c85e5d19e29975d0b974dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to