Mark Bergsma has submitted this change and it was merged.
Change subject: Handle the mobile redirect in a slightly nicer way
......................................................................
Handle the mobile redirect in a slightly nicer way
Change-Id: Ic190af70b1d6ff32b7b0abc074a50c32e4887459
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index f13371b..e8d2022 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -9,7 +9,8 @@
&& req.url ~ "^/wiki/") {
set req.http.MobileHost = regsub(req.http.host,
"^(?:www\.(?=mediawiki))?((?:species|meta|incubator|outreach|strategy|wikimania2012)\.(?=wikimedia)|\w+\.(?!wikimedia|mediawiki)|(?=mediawiki))(wikimedia|wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage|mediawiki)\.",
"\1m.\2.");
if (req.http.Host != req.http.MobileHost) {
- error 666 req.http.X-Forwarded-Proto + "://" +
req.http.MobileHost + req.url;
+ set req.http.Location = req.http.X-Forwarded-Proto +
"://" + req.http.MobileHost + req.url;
+ error 666 "Found";
}
unset req.http.MobileHost;
}
@@ -63,7 +64,7 @@
sub vcl_error {
/* Support mobile redirects */
if (obj.status == 666) {
- set obj.http.Location = obj.response;
+ set obj.http.Location = req.http.Location;
set obj.status = 302;
return(deliver);
}
--
To view, visit https://gerrit.wikimedia.org/r/65820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic190af70b1d6ff32b7b0abc074a50c32e4887459
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
