Andrew Bogott has submitted this change and it was merged.
Change subject: AAA!!! Regex BUG in ZERO. Need depl right away.
......................................................................
AAA!!! Regex BUG in ZERO. Need depl right away.
Sorry, seems like i have messed up regexes, forgetting to remove
the opening paren. Please deploy asap.
I know how much paravoid loves my emergency patches... :)
Change-Id: I530488dc548e501b9e2970989dd1112705862558
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 15 insertions(+), 15 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 574500d..82bbed2 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -57,13 +57,13 @@
}
} else if (req.http.X-CS2 == "623-03") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
"(^((fr|ar|sg|en|es|zh|ha|ln|eo)\.)?m\.") {
+ if (req.http.host ~
"^((fr|ar|sg|en|es|zh|ha|ln|eo)\.)?m\.") {
set req.http.X-CS = "623-03";
}
}
} else if (req.http.X-CS2 == "413-02") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~ "(^((en|ta|si)\.)?zero\.") {
+ if (req.http.host ~ "^((en|ta|si)\.)?zero\.") {
set req.http.X-CS = "413-02";
}
}
@@ -81,13 +81,13 @@
}
} else if (req.http.X-CS2 == "470-03") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~ "(^((en|bn)\.)?(zero|m)\.") {
+ if (req.http.host ~ "^((en|bn)\.)?(zero|m)\.") {
set req.http.X-CS = "470-03";
}
}
} else if (req.http.X-CS2 == "416-03") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~ "(^((en|ar)\.)?(zero|m)\.") {
+ if (req.http.host ~ "^((en|ar)\.)?(zero|m)\.") {
set req.http.X-CS = "416-03";
}
}
@@ -101,7 +101,7 @@
}
} else if (req.http.X-CS2 == "624-02") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
"(^((fr|en|es|de|zh|ar|ha|ln|yo|eo)\.)?m\.") {
+ if (req.http.host ~
"^((fr|en|es|de|zh|ar|ha|ln|yo|eo)\.)?m\.") {
set req.http.X-CS = "624-02";
}
}
@@ -119,7 +119,7 @@
}
} else if (req.http.X-CS2 == "604-00") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
"(^((fr|ar|en|es|de|it|nl|pt|ru|zh)\.)?m\.") {
+ if (req.http.host ~
"^((fr|ar|en|es|de|it|nl|pt|ru|zh)\.)?m\.") {
set req.http.X-CS = "604-00";
}
}
@@ -129,19 +129,19 @@
}
} else if (req.http.X-CS2 == "605-01") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
"(^((ar|en|fr|es|de|it|ru|ja|zh)\.)?m\.") {
+ if (req.http.host ~
"^((ar|en|fr|es|de|it|ru|ja|zh)\.)?m\.") {
set req.http.X-CS = "605-01";
}
}
} else if (req.http.X-CS2 == "641-14") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
"(^((ko|fr|de|en|zh|sw|rw|ar|hi|es)\.)?m\.") {
+ if (req.http.host ~
"^((ko|fr|de|en|zh|sw|rw|ar|hi|es)\.)?m\.") {
set req.http.X-CS = "641-14";
}
}
} else if (req.http.X-CS2 == "420-01") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
"(^((ar|bn|en|tl|ur)\.)?(zero|m)\.") {
+ if (req.http.host ~ "^((ar|bn|en|tl|ur)\.)?(zero|m)\.")
{
set req.http.X-CS = "420-01";
}
}
@@ -151,37 +151,37 @@
}
} else if (req.http.X-CS2 == "250-99") {
if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
"Opera") {
- if (req.http.host ~ "(^((en|ru)\.)?(zero|m)\.") {
+ if (req.http.host ~ "^((en|ru)\.)?(zero|m)\.") {
set req.http.X-CS = "250-99";
}
}
} else if (req.http.X-CS2 == "410-01") {
if (!req.http.X-Forwarded-By || req.http.X-Forwarded-By ==
"Opera") {
- if (req.http.host ~ "(^((en|ur)\.)?(zero|m)\.") {
+ if (req.http.host ~ "^((en|ur)\.)?(zero|m)\.") {
set req.http.X-CS = "410-01";
}
}
} else if (req.http.X-CS2 == "510-11") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~
"(^((id|en|zh|ar|hi|ms|jv|su)\.)?zero\.") {
+ if (req.http.host ~
"^((id|en|zh|ar|hi|ms|jv|su)\.)?zero\.") {
set req.http.X-CS = "510-11";
}
}
} else if (req.http.X-CS2 == "646-02") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~ "(^((fr|en|mg)\.)?m\.") {
+ if (req.http.host ~ "^((fr|en|mg)\.)?m\.") {
set req.http.X-CS = "646-02";
}
}
} else if (req.http.X-CS2 == "436-01") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~ "(^((en|tg|ru)\.)?(zero|m)\.") {
+ if (req.http.host ~ "^((en|tg|ru)\.)?(zero|m)\.") {
set req.http.X-CS = "436-01";
}
}
} else if (req.http.X-CS2 == "401-01") {
if (!req.http.X-Forwarded-By) {
- if (req.http.host ~ "(^((ru|kk|en)\.)?(zero|m)\.") {
+ if (req.http.host ~ "^((ru|kk|en)\.)?(zero|m)\.") {
set req.http.X-CS = "401-01";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/102742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I530488dc548e501b9e2970989dd1112705862558
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
