From 5a0032c35c0e19530178bc67c1d2686770498248 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Sun, 24 May 2020 16:51:40 +0800 Subject: [PATCH 1/5] Update Appledaily.xml --- src/chrome/content/rules/Appledaily.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Appledaily.xml b/src/chrome/content/rules/Appledaily.xml index 35785ed50528..b6d5343f39ac 100644 --- a/src/chrome/content/rules/Appledaily.xml +++ b/src/chrome/content/rules/Appledaily.xml @@ -2,9 +2,7 @@ Nonfunctional hosts in *.appledaily.com, *.appledaily.com.hk and *.appledaily.com.tw: certificate mismatch: - - appledaily.com - www.appledaily.com - - 64.appledaily.com - 71.appledaily.com - appledaily.com.tw - appledaily.com.hk @@ -12,6 +10,10 @@ --> + + + + @@ -40,6 +42,8 @@ + + From 4e030852cc2b936fbee1ed6eb4a7acb8857d2a8b Mon Sep 17 00:00:00 2001 From: cschanaj Date: Mon, 15 Jun 2020 20:35:44 +0800 Subject: [PATCH 2/5] Split and update Appledaily related rulesets --- .../content/rules/Appledaily.com.tw.xml | 13 +++ src/chrome/content/rules/Appledaily.com.xml | 92 +++++++++++++++++++ src/chrome/content/rules/Appledaily.hk.xml | 14 +++ src/chrome/content/rules/Appledaily.xml | 49 ---------- 4 files changed, 119 insertions(+), 49 deletions(-) create mode 100644 src/chrome/content/rules/Appledaily.com.tw.xml create mode 100644 src/chrome/content/rules/Appledaily.com.xml create mode 100644 src/chrome/content/rules/Appledaily.hk.xml delete mode 100644 src/chrome/content/rules/Appledaily.xml diff --git a/src/chrome/content/rules/Appledaily.com.tw.xml b/src/chrome/content/rules/Appledaily.com.tw.xml new file mode 100644 index 000000000000..0dca7f20506b --- /dev/null +++ b/src/chrome/content/rules/Appledaily.com.tw.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/src/chrome/content/rules/Appledaily.com.xml b/src/chrome/content/rules/Appledaily.com.xml new file mode 100644 index 000000000000..a121ef1dc50d --- /dev/null +++ b/src/chrome/content/rules/Appledaily.com.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Appledaily.hk.xml b/src/chrome/content/rules/Appledaily.hk.xml new file mode 100644 index 000000000000..674b93bc0aeb --- /dev/null +++ b/src/chrome/content/rules/Appledaily.hk.xml @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/Appledaily.xml b/src/chrome/content/rules/Appledaily.xml deleted file mode 100644 index b6d5343f39ac..000000000000 --- a/src/chrome/content/rules/Appledaily.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 1feb027cc42dd5871f53f21e53132056d1f61408 Mon Sep 17 00:00:00 2001 From: cschanaj Date: Mon, 15 Jun 2020 20:41:12 +0800 Subject: [PATCH 3/5] Update Appledaily.com.xml --- src/chrome/content/rules/Appledaily.com.xml | 30 ++++++++++----------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/rules/Appledaily.com.xml b/src/chrome/content/rules/Appledaily.com.xml index a121ef1dc50d..d6d45219b59a 100644 --- a/src/chrome/content/rules/Appledaily.com.xml +++ b/src/chrome/content/rules/Appledaily.com.xml @@ -3,30 +3,18 @@ SSL peer certificate was not OK: - 71.appledaily.com - www.appledaily.com - - SSL server certificate status verification FAILED: - - 20.appledaily.com - - add.appledaily.com - - as.appledaily.com - - cms-privilegehk.appledaily.com - - events.appledaily.com - - green.appledaily.com - - news.appledaily.com - - privilegehk.appledaily.com - - privilegetw.appledaily.com - - privilegetw-static.appledaily.com - - quote.appledaily.com - - realtime.appledaily.com - - reporter.appledaily.com - - worldcup2014.appledaily.com --> + + + + @@ -38,6 +26,7 @@ + @@ -51,6 +40,7 @@ + @@ -60,13 +50,20 @@ + + + + + + + @@ -84,6 +81,7 @@ + From d46ca2ada35fa99d14380c8b5d2975ceae9c5165 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Mon, 15 Jun 2020 20:51:22 +0800 Subject: [PATCH 4/5] Update and rename Appledaily.hk.xml to Appledaily.com.hk.xml --- .../rules/{Appledaily.hk.xml => Appledaily.com.hk.xml} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename src/chrome/content/rules/{Appledaily.hk.xml => Appledaily.com.hk.xml} (63%) diff --git a/src/chrome/content/rules/Appledaily.hk.xml b/src/chrome/content/rules/Appledaily.com.hk.xml similarity index 63% rename from src/chrome/content/rules/Appledaily.hk.xml rename to src/chrome/content/rules/Appledaily.com.hk.xml index 674b93bc0aeb..86d8b3e87458 100644 --- a/src/chrome/content/rules/Appledaily.hk.xml +++ b/src/chrome/content/rules/Appledaily.com.hk.xml @@ -3,9 +3,7 @@ SSL peer certificate was not OK: - appledaily.com.hk --> - - - + From 428b4ea50e7afea9b456231f493684c6fe0479a5 Mon Sep 17 00:00:00 2001 From: Chan Chak Shing Date: Thu, 18 Jun 2020 12:09:22 +0800 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: pipboy96 --- .../content/rules/Appledaily.com.hk.xml | 18 ++++++++++++++++++ .../content/rules/Appledaily.com.tw.xml | 19 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/src/chrome/content/rules/Appledaily.com.hk.xml b/src/chrome/content/rules/Appledaily.com.hk.xml index 86d8b3e87458..dec72cc6dccb 100644 --- a/src/chrome/content/rules/Appledaily.com.hk.xml +++ b/src/chrome/content/rules/Appledaily.com.hk.xml @@ -4,6 +4,24 @@ - appledaily.com.hk --> + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Appledaily.com.tw.xml b/src/chrome/content/rules/Appledaily.com.tw.xml index 0dca7f20506b..ceab129c6f0f 100644 --- a/src/chrome/content/rules/Appledaily.com.tw.xml +++ b/src/chrome/content/rules/Appledaily.com.tw.xml @@ -4,8 +4,27 @@ - appledaily.com.tw --> + + + + + + + + + + + + + + + + + + +