BBlack has submitted this change and it was merged.

Change subject: Text VCL: same no-article-cache for mobile as desktop
......................................................................


Text VCL: same no-article-cache for mobile as desktop

Bug: T109286
Change-Id: I98e23e2a5d42a7fbe7742cb24c5ac3f9dca150d2
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 3 insertions(+), 9 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 8e51874..9af55f8 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -200,15 +200,9 @@
        // on our URL routing schemes.
        // NOTE: Only apply to pages. Don't steal cachability of api.php, 
load.php, etc. (T102898, T113007)
 
-       if (!req.http.X-Subdomain) {
-               if (req.url ~ "^/wiki/" || req.url ~ "^/w/index\.php" || 
req.url ~ "^/\?title=") {
-                       // ...but exempt CentralNotice banner special pages
-                       if (req.url !~ "^/wiki/Special\:Banner") {
-                               set resp.http.Cache-Control = "private, 
s-maxage=0, max-age=0, must-revalidate";
-                       }
-               }
-       } else {
-               if ((req.url ~ "^/wiki/" || req.url ~ "^/w/index\.php") && 
resp.http.Cache-Control ~ "s-maxage=[1-9]") {
+       if (req.url ~ "^/wiki/" || req.url ~ "^/w/index\.php" || req.url ~ 
"^/\?title=") {
+               // ...but exempt CentralNotice banner special pages
+               if (req.url !~ "^/wiki/Special\:Banner") {
                        set resp.http.Cache-Control = "private, s-maxage=0, 
max-age=0, must-revalidate";
                }
        }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98e23e2a5d42a7fbe7742cb24c5ac3f9dca150d2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to