BBlack has submitted this change and it was merged.
Change subject: Optimized the number of req.http.host checks performed
......................................................................
Optimized the number of req.http.host checks performed
Reordered vcl_recv if() that checks the HOST header to minimize
the number of string/regex operations performed.
Change-Id: I9b1a992dbb7e7618bc13c9677c2d4c04a84696e8
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 13 insertions(+), 13 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 8ca1f53..9fe4009 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -22,24 +22,24 @@
set req.http.X-Subdomain = "M";
}
- /* Replace <language>.(m|zero).<project>.org by
<language>.<project>.org */
- set req.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
-
- /* Rewrite <language>.wap.wikipedia.org to new mobile site */
- set req.http.host = regsub(req.http.host, "^([a-zA-Z0-9-]+)\.wap\.",
"\1.mobile.");
-
/* Rewrite m.mediawiki.org to mediawiki.org etc */
if (req.http.host == "m.mediawiki.org") {
set req.http.host = "www.mediawiki.org";
- }
- if (req.http.host == "m.wikimediafoundation.org") {
+ } else if (req.http.host == "m.wikimediafoundation.org") {
set req.http.host = "wikimediafoundation.org";
- }
+ } else {
- /* Support the old mobile.wikipedia.org wap gateway */
- if (req.http.host ~ "^([a-zA-Z0-9-]+)\.mobile\.([a-zA-Z0-9-]+)\.org$") {
- set req.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.mobile\.", "\1.");
- set req.url = regsub(req.url, "\S+[\?&]go=([^&]+).*",
"/wiki/\1");
+ /* Replace <language>.(m|zero).<project>.org by
<language>.<project>.org */
+ set req.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
+
+ /* Rewrite <language>.wap.wikipedia.org to new mobile site */
+ set req.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.wap\.", "\1.mobile.");
+
+ /* Support the old mobile.wikipedia.org wap gateway */
+ if (req.http.host ~
"^([a-zA-Z0-9-]+)\.mobile\.([a-zA-Z0-9-]+)\.org$") {
+ set req.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.mobile\.", "\1.");
+ set req.url = regsub(req.url, "\S+[\?&]go=([^&]+).*",
"/wiki/\1");
+ }
}
/* Allow purging */
--
To view, visit https://gerrit.wikimedia.org/r/91569
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b1a992dbb7e7618bc13c9677c2d4c04a84696e8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[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
