Ema has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356570 )
Change subject: Maps cache: fix parameters stripped away
......................................................................
Maps cache: fix parameters stripped away
Bug: T164608
Bug: T166735
Change-Id: Id1200aebf2ed42fd0a64453dee46a43040129483
---
M modules/varnish/templates/upload-frontend.inc.vcl.erb
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Ema: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/upload-frontend.inc.vcl.erb
b/modules/varnish/templates/upload-frontend.inc.vcl.erb
index c43c7e8..d3b2e14 100644
--- a/modules/varnish/templates/upload-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/upload-frontend.inc.vcl.erb
@@ -20,13 +20,15 @@
call upload_common_recv;
- // Look for a "download" request parameter
- if (req.url ~ "(?i)(\?|&)download(=|&|$)") {
- set req.http.X-Content-Disposition = "attachment";
- }
+ if (req.http.host == "<%= @vcl_config.fetch('upload_domain') %>") {
+ // Look for a "download" request parameter
+ if (req.url ~ "(?i)(\?|&)download(=|&|$)") {
+ set req.http.X-Content-Disposition = "attachment";
+ }
- // Strip away all query parameters
- set req.url = regsub(req.url, "\?.*$", "");
+ // Strip away all query parameters
+ set req.url = regsub(req.url, "\?.*$", "");
+ }
// Replace double slashes
set req.url = regsuball(req.url, "/{2,}", "/");
--
To view, visit https://gerrit.wikimedia.org/r/356570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1200aebf2ed42fd0a64453dee46a43040129483
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
