Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75642
Change subject: X-Forwarded-Proto is empty for straight http
......................................................................
X-Forwarded-Proto is empty for straight http
Change-Id: I236c25f345965b6551d42778d4480c4ca0860632
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/75642/1
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index 7fd467d..675ffb4 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -11,7 +11,11 @@
&& req.url ~ "^/wiki/") {
set req.http.MobileHost = regsub(req.http.host,
"^(?:www\.(?=mediawiki))?((?:commons|species|meta|incubator|outreach|strategy|wikimania2012|wikimania2013)\.(?=wikimedia)|\w+\.(?!wikimedia|mediawiki)|(?=mediawiki))(wikimedia|wikipedia|wiktionary|wikinews|wikisource|wikiquote|wikibooks|wikiversity|wikivoyage|mediawiki)\.",
"\1m.\2.");
if (req.http.Host != req.http.MobileHost) {
- set req.http.Location = req.http.X-Forwarded-Proto +
"://" + req.http.MobileHost + req.url;
+ if (req.http.X-Forwarded-Proto {
+ set req.http.Location =
req.http.X-Forwarded-Proto + "://" + req.http.MobileHost + req.url;
+ } else {
+ set req.http.Location = "http://"; +
req.http.MobileHost + req.url;
+ }
error 666 "Found";
}
unset req.http.MobileHost;
@@ -35,12 +39,7 @@
* do this after vcl_recv_purge, as it operates on a full URI */
call rewrite_proxy_urls;
- if (!req.http.X-Forwarded-Proto) {
- set req.http.X-Forwarded-Proto = "http";
- }
-
call mobile_redirect;
-
call pass_requests;
/* Users that just logged out, should not get a 304 for their
--
To view, visit https://gerrit.wikimedia.org/r/75642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I236c25f345965b6551d42778d4480c4ca0860632
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
