From 16c7530f6b8b92ed6bb0a1e245d4f76b8df6db11 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 22 Oct 2017 17:10:58 +0800 Subject: [PATCH 1/2] Require lowercase targets as per #13036 --- utils/relaxng.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/relaxng.xml b/utils/relaxng.xml index 181d021d76e8..ab287512c3fa 100644 --- a/utils/relaxng.xml +++ b/utils/relaxng.xml @@ -33,7 +33,7 @@ - (([A-Za-z0-9äö_-]+|\*)\.)*([A-Za-z0-9äö-]+|\*) + (([a-z0-9äö_-]+|\*)\.)*([a-z0-9äö-]+|\*) From 298daeb34a89219c920cc5be21807caf7b1ceb65 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 22 Oct 2017 17:46:37 +0800 Subject: [PATCH 2/2] Fix travis rules-test --- src/chrome/content/rules/2K_Games.xml | 62 ++++++++----------- src/chrome/content/rules/Avanza.se.xml | 8 +-- src/chrome/content/rules/Sesamstrasse.de.xml | 11 ++-- .../content/rules/Spielfuerdeinland.de.xml | 25 +++----- src/chrome/content/rules/TNS-Global.xml | 56 ++++++++--------- src/chrome/content/rules/TunnelBear.com.xml | 6 ++ src/chrome/content/rules/TunnelBear.xml | 6 -- src/chrome/content/rules/hkjc.com.xml | 6 -- src/chrome/content/rules/technopark.ru.xml | 4 +- 9 files changed, 82 insertions(+), 102 deletions(-) create mode 100644 src/chrome/content/rules/TunnelBear.com.xml delete mode 100644 src/chrome/content/rules/TunnelBear.xml diff --git a/src/chrome/content/rules/2K_Games.xml b/src/chrome/content/rules/2K_Games.xml index 58d9a1d1c2df..e9b8fb965c2e 100644 --- a/src/chrome/content/rules/2K_Games.xml +++ b/src/chrome/content/rules/2K_Games.xml @@ -1,52 +1,44 @@ - - - - - - + + - - + - + + - - - - + diff --git a/src/chrome/content/rules/Avanza.se.xml b/src/chrome/content/rules/Avanza.se.xml index 70d42fda023f..1a06794b0735 100644 --- a/src/chrome/content/rules/Avanza.se.xml +++ b/src/chrome/content/rules/Avanza.se.xml @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/src/chrome/content/rules/Sesamstrasse.de.xml b/src/chrome/content/rules/Sesamstrasse.de.xml index c1d2f90a6203..d998bea8c31c 100644 --- a/src/chrome/content/rules/Sesamstrasse.de.xml +++ b/src/chrome/content/rules/Sesamstrasse.de.xml @@ -1,9 +1,8 @@ - - + + + + - - - + diff --git a/src/chrome/content/rules/Spielfuerdeinland.de.xml b/src/chrome/content/rules/Spielfuerdeinland.de.xml index 8d547713eb0e..600d22318f7c 100644 --- a/src/chrome/content/rules/Spielfuerdeinland.de.xml +++ b/src/chrome/content/rules/Spielfuerdeinland.de.xml @@ -1,22 +1,17 @@ - - - - - - - - - - + + + - + diff --git a/src/chrome/content/rules/TNS-Global.xml b/src/chrome/content/rules/TNS-Global.xml index 311de7927412..cdb731580b37 100644 --- a/src/chrome/content/rules/TNS-Global.xml +++ b/src/chrome/content/rules/TNS-Global.xml @@ -1,39 +1,40 @@ - + Timeout was reached: + - tnspostalplatformrmd-uat.tnsglobal.com - + SSL connect error: + - timeline.tnsglobal.com + + SSL peer certificate was not OK: + - blogs.tnsglobal.com + - go.tnsglobal.com + - tnscourierchallenge.tnsglobal.com + - tnsselfrecruitment.tnsglobal.com + - www2.tnsglobal.com + + Incomplete certificate chain error: + - insightondemand.tnsglobal.com +--> + - - - @@ -41,10 +42,9 @@ Fetch error: http://tnsselfrecruitment.tnsglobal.com/ => https://tnsselfrecruitm - + - diff --git a/src/chrome/content/rules/TunnelBear.com.xml b/src/chrome/content/rules/TunnelBear.com.xml new file mode 100644 index 000000000000..cfab114e10f9 --- /dev/null +++ b/src/chrome/content/rules/TunnelBear.com.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/chrome/content/rules/TunnelBear.xml b/src/chrome/content/rules/TunnelBear.xml deleted file mode 100644 index 9515dafe3f90..000000000000 --- a/src/chrome/content/rules/TunnelBear.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/chrome/content/rules/hkjc.com.xml b/src/chrome/content/rules/hkjc.com.xml index 1da61acb2d18..0a5b1b37fe7d 100644 --- a/src/chrome/content/rules/hkjc.com.xml +++ b/src/chrome/content/rules/hkjc.com.xml @@ -116,12 +116,6 @@ - - - - - - diff --git a/src/chrome/content/rules/technopark.ru.xml b/src/chrome/content/rules/technopark.ru.xml index e2b19317e3f6..0887ea891d04 100644 --- a/src/chrome/content/rules/technopark.ru.xml +++ b/src/chrome/content/rules/technopark.ru.xml @@ -23,8 +23,8 @@ mail.technopark.ru different content - - + +