From 59137c40d5e33abea3216e917f86b74eaffa8150 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 11:48:28 +0800 Subject: [PATCH 01/51] Update and rename Samsung.xml to Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 157 +++++++++++++++++++++++ src/chrome/content/rules/Samsung.xml | 150 ---------------------- 2 files changed, 157 insertions(+), 150 deletions(-) create mode 100644 src/chrome/content/rules/Samsung.com.xml delete mode 100644 src/chrome/content/rules/Samsung.xml diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml new file mode 100644 index 000000000000..b71f08a06c49 --- /dev/null +++ b/src/chrome/content/rules/Samsung.com.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/chrome/content/rules/Samsung.xml b/src/chrome/content/rules/Samsung.xml deleted file mode 100644 index 410b3e632c76..000000000000 --- a/src/chrome/content/rules/Samsung.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 23d2d8ea5acbd3ce2b1b2649e786361010b4f5db Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 11:51:42 +0800 Subject: [PATCH 02/51] Create Samsung_CN.xml --- src/chrome/content/rules/Samsung_CN.xml | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/chrome/content/rules/Samsung_CN.xml diff --git a/src/chrome/content/rules/Samsung_CN.xml b/src/chrome/content/rules/Samsung_CN.xml new file mode 100644 index 000000000000..53ab044e06a2 --- /dev/null +++ b/src/chrome/content/rules/Samsung_CN.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + From adc250d1e3521c42beea8d5606e702b55ba4f5f1 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 11:56:15 +0800 Subject: [PATCH 03/51] Create SamsungFire.com.xml --- src/chrome/content/rules/SamsungFire.com.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/SamsungFire.com.xml diff --git a/src/chrome/content/rules/SamsungFire.com.xml b/src/chrome/content/rules/SamsungFire.com.xml new file mode 100644 index 000000000000..c658503b7c86 --- /dev/null +++ b/src/chrome/content/rules/SamsungFire.com.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + From 83db1d7b1a61e5597a209b47e15447563dd47284 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 11:57:05 +0800 Subject: [PATCH 04/51] Create Samsung_Indiaestore.xml --- src/chrome/content/rules/Samsung_Indiaestore.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/chrome/content/rules/Samsung_Indiaestore.xml diff --git a/src/chrome/content/rules/Samsung_Indiaestore.xml b/src/chrome/content/rules/Samsung_Indiaestore.xml new file mode 100644 index 000000000000..7b3d56b6f325 --- /dev/null +++ b/src/chrome/content/rules/Samsung_Indiaestore.xml @@ -0,0 +1,12 @@ + + + + + + + + + + From 74e415eee68afdd5b1e0b5823737ab358997585d Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 11:58:05 +0800 Subject: [PATCH 05/51] Create Samsung_Sem.xml --- src/chrome/content/rules/Samsung_Sem.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/chrome/content/rules/Samsung_Sem.xml diff --git a/src/chrome/content/rules/Samsung_Sem.xml b/src/chrome/content/rules/Samsung_Sem.xml new file mode 100644 index 000000000000..55baf027566d --- /dev/null +++ b/src/chrome/content/rules/Samsung_Sem.xml @@ -0,0 +1,16 @@ + + + + + + + + + + From d1cc85baef8533330646662629ff1cdd3a7da97a Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:00:04 +0800 Subject: [PATCH 06/51] Update Samsung_Apps.xml --- src/chrome/content/rules/Samsung_Apps.xml | 47 ++++++++--------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Apps.xml b/src/chrome/content/rules/Samsung_Apps.xml index e008194f078d..f9d4123bb155 100644 --- a/src/chrome/content/rules/Samsung_Apps.xml +++ b/src/chrome/content/rules/Samsung_Apps.xml @@ -1,23 +1,8 @@ - + - - + + - - - + - - - - + - + + From bc430c654ea7ee838d2fd55784857b07c2cfd965 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:01:41 +0800 Subject: [PATCH 07/51] Update Samsung_mySingle.xml --- src/chrome/content/rules/Samsung_mySingle.xml | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/rules/Samsung_mySingle.xml b/src/chrome/content/rules/Samsung_mySingle.xml index 504cfd73d214..30d33abe6503 100644 --- a/src/chrome/content/rules/Samsung_mySingle.xml +++ b/src/chrome/content/rules/Samsung_mySingle.xml @@ -1,19 +1,34 @@ - + + + + + + + + - - - + From 8beffd8a646fc23849055c5b8e59ea65c889b0df Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:02:28 +0800 Subject: [PATCH 08/51] Update Samsung_Direct.xml --- src/chrome/content/rules/Samsung_Direct.xml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Direct.xml b/src/chrome/content/rules/Samsung_Direct.xml index 87dd077a3667..2b860aa2cd9d 100644 --- a/src/chrome/content/rules/Samsung_Direct.xml +++ b/src/chrome/content/rules/Samsung_Direct.xml @@ -1,19 +1,13 @@ - - + + + - + From 179295fc63483b510dfc242e68bcb876ce2c8dd0 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:03:34 +0800 Subject: [PATCH 09/51] Update Samsung_Techwin.xml --- src/chrome/content/rules/Samsung_Techwin.xml | 21 ++++++-------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Techwin.xml b/src/chrome/content/rules/Samsung_Techwin.xml index d1a5323f541b..464c3d99f2a8 100644 --- a/src/chrome/content/rules/Samsung_Techwin.xml +++ b/src/chrome/content/rules/Samsung_Techwin.xml @@ -1,25 +1,16 @@ - + + - - - - + to="https://www.hanwhatechwin.co.kr/" /> From 3460e17f1c45d94c4822caa56eec8089d8b2a438 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:08:09 +0800 Subject: [PATCH 10/51] Delete Samsung-falsemixed.xml --- src/chrome/content/rules/Samsung-falsemixed.xml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/chrome/content/rules/Samsung-falsemixed.xml diff --git a/src/chrome/content/rules/Samsung-falsemixed.xml b/src/chrome/content/rules/Samsung-falsemixed.xml deleted file mode 100644 index 457bc4217df5..000000000000 --- a/src/chrome/content/rules/Samsung-falsemixed.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file From 85414dcebbfb69116df78fda9d434328efcffbcc Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:08:40 +0800 Subject: [PATCH 11/51] Delete Samsung_LFD.xml --- src/chrome/content/rules/Samsung_LFD.xml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/chrome/content/rules/Samsung_LFD.xml diff --git a/src/chrome/content/rules/Samsung_LFD.xml b/src/chrome/content/rules/Samsung_LFD.xml deleted file mode 100644 index c653e2147e51..000000000000 --- a/src/chrome/content/rules/Samsung_LFD.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - From 60c1fa543343f4196fb83fe2e2b350859557c987 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:10:23 +0800 Subject: [PATCH 12/51] Rename SamsungFire.com.xml to Samsung_Fire.xml --- .../content/rules/{SamsungFire.com.xml => Samsung_Fire.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/chrome/content/rules/{SamsungFire.com.xml => Samsung_Fire.xml} (100%) diff --git a/src/chrome/content/rules/SamsungFire.com.xml b/src/chrome/content/rules/Samsung_Fire.xml similarity index 100% rename from src/chrome/content/rules/SamsungFire.com.xml rename to src/chrome/content/rules/Samsung_Fire.xml From 79d973960aaa6955a98678194345aa1ed710929f Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:12:44 +0800 Subject: [PATCH 13/51] Update and rename Samsung_Knox.com.xml to Samsung_Knox.xml --- src/chrome/content/rules/Samsung_Knox.com.xml | 26 ------------------- src/chrome/content/rules/Samsung_Knox.xml | 21 +++++++++++++++ 2 files changed, 21 insertions(+), 26 deletions(-) delete mode 100644 src/chrome/content/rules/Samsung_Knox.com.xml create mode 100644 src/chrome/content/rules/Samsung_Knox.xml diff --git a/src/chrome/content/rules/Samsung_Knox.com.xml b/src/chrome/content/rules/Samsung_Knox.com.xml deleted file mode 100644 index 93b55ddfa5e7..000000000000 --- a/src/chrome/content/rules/Samsung_Knox.com.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Samsung_Knox.xml b/src/chrome/content/rules/Samsung_Knox.xml new file mode 100644 index 000000000000..affdd29169ad --- /dev/null +++ b/src/chrome/content/rules/Samsung_Knox.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + From 2b8b3b2624e8e3168ce8307457f78dde66627b96 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:14:34 +0800 Subject: [PATCH 14/51] Delete ChatON.xml --- src/chrome/content/rules/ChatON.xml | 49 ----------------------------- 1 file changed, 49 deletions(-) delete mode 100644 src/chrome/content/rules/ChatON.xml diff --git a/src/chrome/content/rules/ChatON.xml b/src/chrome/content/rules/ChatON.xml deleted file mode 100644 index 70d4dc42349d..000000000000 --- a/src/chrome/content/rules/ChatON.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - From f1d0d824df9485227853e607904990437e6083de Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:15:11 +0800 Subject: [PATCH 15/51] Update AllShare_Play.xml --- src/chrome/content/rules/AllShare_Play.xml | 49 ++++++++++------------ 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/src/chrome/content/rules/AllShare_Play.xml b/src/chrome/content/rules/AllShare_Play.xml index 96d9998585c0..061e4c6d1d3c 100644 --- a/src/chrome/content/rules/AllShare_Play.xml +++ b/src/chrome/content/rules/AllShare_Play.xml @@ -1,33 +1,26 @@ - - - - - - - + - - - - + + + + + + + + + + + + + + + From 9fdab86f35d7e91ee0aadeeb7dd801cd4dbb4c42 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:21:24 +0800 Subject: [PATCH 16/51] Update Samsung_CN.xml --- src/chrome/content/rules/Samsung_CN.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Samsung_CN.xml b/src/chrome/content/rules/Samsung_CN.xml index 53ab044e06a2..531de6c288c0 100644 --- a/src/chrome/content/rules/Samsung_CN.xml +++ b/src/chrome/content/rules/Samsung_CN.xml @@ -23,6 +23,6 @@ - + From fe68cb1fe6dfd20f5d56b6323ae4b0a3c9e87c83 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:35:45 +0800 Subject: [PATCH 17/51] Update Samsung_Apps.xml --- src/chrome/content/rules/Samsung_Apps.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Apps.xml b/src/chrome/content/rules/Samsung_Apps.xml index f9d4123bb155..86a003e3ec44 100644 --- a/src/chrome/content/rules/Samsung_Apps.xml +++ b/src/chrome/content/rules/Samsung_Apps.xml @@ -1,6 +1,9 @@ - - - - + + + From 83fc3c27a4191705dac521689d21475d3db34e0a Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 12:58:54 +0800 Subject: [PATCH 18/51] Update Samsung_Apps.xml --- src/chrome/content/rules/Samsung_Apps.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/rules/Samsung_Apps.xml b/src/chrome/content/rules/Samsung_Apps.xml index 86a003e3ec44..c14dcaf0fe0b 100644 --- a/src/chrome/content/rules/Samsung_Apps.xml +++ b/src/chrome/content/rules/Samsung_Apps.xml @@ -46,6 +46,7 @@ + From 3ebc3d6f2c7aacfa86fddc6ee090d89433085463 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 13:01:47 +0800 Subject: [PATCH 19/51] Update Samsung_CN.xml --- src/chrome/content/rules/Samsung_CN.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/rules/Samsung_CN.xml b/src/chrome/content/rules/Samsung_CN.xml index 531de6c288c0..fceae4d2e813 100644 --- a/src/chrome/content/rules/Samsung_CN.xml +++ b/src/chrome/content/rules/Samsung_CN.xml @@ -1,6 +1,8 @@ - - - From f701012a13a9927131eaa425b2858fd46880c9db Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 13:26:47 +0800 Subject: [PATCH 22/51] Update Samsung_Apps.xml --- src/chrome/content/rules/Samsung_Apps.xml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Apps.xml b/src/chrome/content/rules/Samsung_Apps.xml index 43ebb6144cee..2d596b3face6 100644 --- a/src/chrome/content/rules/Samsung_Apps.xml +++ b/src/chrome/content/rules/Samsung_Apps.xml @@ -44,21 +44,20 @@ - + + - - + + + - - - From 5cff9f501f55941e02dc79f6afd2f1e21a870f13 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 13:37:47 +0800 Subject: [PATCH 23/51] Update Samsung_CN.xml --- src/chrome/content/rules/Samsung_CN.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/Samsung_CN.xml b/src/chrome/content/rules/Samsung_CN.xml index f97c257e65ff..9e205e149514 100644 --- a/src/chrome/content/rules/Samsung_CN.xml +++ b/src/chrome/content/rules/Samsung_CN.xml @@ -4,6 +4,7 @@ Check error: Non-2xx HTTP code: http://samsung.cn/ (200) => https://www.samsung.com/cn/ (403) Non-2xx HTTP code: http://www.samsung.cn/ (200) => https://www.samsung.com/cn/ (403) + Non-2xx HTTP code: http://samsung.com.cn/ (200) => https://www.samsung.com/cn/ (403) Problematic domains: @@ -14,15 +15,12 @@ --> - - + - - + - + From 1b4f725cab27ac945047d7b8813629c70c647480 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 13:42:26 +0800 Subject: [PATCH 24/51] Update Samsung_Apps.xml --- src/chrome/content/rules/Samsung_Apps.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/chrome/content/rules/Samsung_Apps.xml b/src/chrome/content/rules/Samsung_Apps.xml index 2d596b3face6..3d1c2b717cac 100644 --- a/src/chrome/content/rules/Samsung_Apps.xml +++ b/src/chrome/content/rules/Samsung_Apps.xml @@ -47,10 +47,13 @@ + + + Date: Sat, 20 Aug 2016 13:51:24 +0800 Subject: [PATCH 25/51] Update Samsung_Apps.xml --- src/chrome/content/rules/Samsung_Apps.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Samsung_Apps.xml b/src/chrome/content/rules/Samsung_Apps.xml index 3d1c2b717cac..392bbf615f78 100644 --- a/src/chrome/content/rules/Samsung_Apps.xml +++ b/src/chrome/content/rules/Samsung_Apps.xml @@ -44,15 +44,18 @@ - + + + From 0dc6906118df6007755c97c7ba48331cb0068033 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Sat, 20 Aug 2016 13:53:53 +0800 Subject: [PATCH 26/51] Update Samsung_Apps.xml --- src/chrome/content/rules/Samsung_Apps.xml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Apps.xml b/src/chrome/content/rules/Samsung_Apps.xml index 392bbf615f78..1bcf5ba503eb 100644 --- a/src/chrome/content/rules/Samsung_Apps.xml +++ b/src/chrome/content/rules/Samsung_Apps.xml @@ -1,8 +1,5 @@ - + + + + + @@ -57,16 +58,9 @@ - - + - - - - - From 80b4798a2c51a287098b7120241107278d87f675 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Tue, 23 Aug 2016 23:46:53 +0800 Subject: [PATCH 27/51] Update AllShare_Play.xml --- src/chrome/content/rules/AllShare_Play.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/AllShare_Play.xml b/src/chrome/content/rules/AllShare_Play.xml index 061e4c6d1d3c..cc92b84d0514 100644 --- a/src/chrome/content/rules/AllShare_Play.xml +++ b/src/chrome/content/rules/AllShare_Play.xml @@ -2,7 +2,7 @@ For other Samsung coverage, see Samsung.com.xml. Mismatch: - sw.* + sw.* --> @@ -11,13 +11,15 @@ - - - + + + + + - - + From 98d537946b9d93413bd3e5a378a4e544346a3743 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Tue, 23 Aug 2016 23:59:45 +0800 Subject: [PATCH 28/51] Update Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml index b71f08a06c49..fb47deba8300 100644 --- a/src/chrome/content/rules/Samsung.com.xml +++ b/src/chrome/content/rules/Samsung.com.xml @@ -104,8 +104,9 @@ + + - @@ -123,15 +124,8 @@ - - - - - - From 3c638a0f35e56412fd76c3644e0a153e6fa5c605 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 00:25:26 +0800 Subject: [PATCH 29/51] Update Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 45 +++++++++++++++--------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml index fb47deba8300..e06bd759ad19 100644 --- a/src/chrome/content/rules/Samsung.com.xml +++ b/src/chrome/content/rules/Samsung.com.xml @@ -85,8 +85,8 @@ - - + + @@ -104,8 +104,8 @@ - - + + @@ -116,26 +116,39 @@ - - - - - - - - + - + + + + + + + - + + + + + + + + + + + + + + + @@ -147,5 +160,5 @@ - + From 621db015d64ae53b51c79115e79f5d423f085ae6 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 00:44:38 +0800 Subject: [PATCH 30/51] Update Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml index e06bd759ad19..b080403fa517 100644 --- a/src/chrome/content/rules/Samsung.com.xml +++ b/src/chrome/content/rules/Samsung.com.xml @@ -136,7 +136,7 @@ - + @@ -144,7 +144,7 @@ - + From 1d155f76a1f1cd5c67f15b62695292ab2752f862 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 10:48:05 +0800 Subject: [PATCH 31/51] Update Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 88 +++++++++++++----------- 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml index b080403fa517..e9b48d07aadf 100644 --- a/src/chrome/content/rules/Samsung.com.xml +++ b/src/chrome/content/rules/Samsung.com.xml @@ -35,6 +35,7 @@ - nmetrics (mismatched, CN: *.112.2o7.net) - shop.us (some paths redirect to http) - smm (mismatched) + - stg-account (MCB at https://stg-account.samsung.com/membership/service/getServieInfoList.do and break the auto recirect for https://stg-account.samsung.com/membership/signUp.do and so on.) Partially covered samsung.com subdomains: - apps (redirects to main page of sumsung by country) @@ -56,7 +57,6 @@ - nmetrics (→ samsung-com.112.2o7.net) - smetrics - secureus - - stg-account - support-cn - us @@ -84,12 +84,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -102,6 +136,7 @@ + @@ -118,47 +153,20 @@ - - + - - - - + - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - From efd05da13da2b848de50e727dada68509ba1a0b4 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 14:13:53 +0800 Subject: [PATCH 32/51] Update Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 36 +++++++++++------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml index e9b48d07aadf..380c98a501fc 100644 --- a/src/chrome/content/rules/Samsung.com.xml +++ b/src/chrome/content/rules/Samsung.com.xml @@ -70,10 +70,6 @@ - css on link.samsung.com from pub.content.samsung.com * * Secured by us - ² Unsecurable <= 400 - - NB: We secure all resources, and thus - -falsemixed should be merged for Ffx 24. Not exist: allshareplay.samsung.com @@ -122,7 +118,22 @@ + + + + + + + + + + + + + + + @@ -137,23 +148,10 @@ - - - - - - - - - - - - - - - + + From 52cd3ecec1965bb60a4892693a198dcfda7bb8bc Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 14:15:06 +0800 Subject: [PATCH 33/51] Update AllShare_Play.xml --- src/chrome/content/rules/AllShare_Play.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/rules/AllShare_Play.xml b/src/chrome/content/rules/AllShare_Play.xml index cc92b84d0514..63f33c32d21e 100644 --- a/src/chrome/content/rules/AllShare_Play.xml +++ b/src/chrome/content/rules/AllShare_Play.xml @@ -12,7 +12,6 @@ - From 40f5f4e1ab722f39e23d06699da4bf4e789f71fb Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 14:23:23 +0800 Subject: [PATCH 34/51] Update Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml index 380c98a501fc..9d9336fab013 100644 --- a/src/chrome/content/rules/Samsung.com.xml +++ b/src/chrome/content/rules/Samsung.com.xml @@ -133,7 +133,7 @@ - + From 433ba63b827b1e0080cfeea7c72a68011b8d8fed Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 14:36:55 +0800 Subject: [PATCH 35/51] Update Samsung_Apps.xml --- src/chrome/content/rules/Samsung_Apps.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Samsung_Apps.xml b/src/chrome/content/rules/Samsung_Apps.xml index 1bcf5ba503eb..e529abc80949 100644 --- a/src/chrome/content/rules/Samsung_Apps.xml +++ b/src/chrome/content/rules/Samsung_Apps.xml @@ -31,6 +31,8 @@ 502: - tv + Mismatch: + m.\w+ These domains will redirect to new samsung appstore auto by apps.samsung.com/mercury/main/getMain.as : - ^samsungapps.com @@ -45,7 +47,7 @@ - @@ -62,5 +64,8 @@ + + + From 6bed121f1bd14b453d78e921859a0d7dea448c9c Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 14:43:49 +0800 Subject: [PATCH 36/51] Update Samsung_Fire.xml --- src/chrome/content/rules/Samsung_Fire.xml | 25 ++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Fire.xml b/src/chrome/content/rules/Samsung_Fire.xml index c658503b7c86..a64f482b5403 100644 --- a/src/chrome/content/rules/Samsung_Fire.xml +++ b/src/chrome/content/rules/Samsung_Fire.xml @@ -1,15 +1,34 @@ - + + + + + + + + + + + + + + + + + + + + + From ec7506f8a21ed0c103c614a5d3a264c53ea6ba8d Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 15:40:58 +0800 Subject: [PATCH 37/51] Update Samsung_Fire.xml --- src/chrome/content/rules/Samsung_Fire.xml | 43 +++++++++++++---------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Fire.xml b/src/chrome/content/rules/Samsung_Fire.xml index a64f482b5403..8ea643ca3827 100644 --- a/src/chrome/content/rules/Samsung_Fire.xml +++ b/src/chrome/content/rules/Samsung_Fire.xml @@ -2,33 +2,38 @@ For other Samsung coverage, see Samsung.com.xml. + Mismatch: + blog + gooddaddy + s + weather + yuseong + + Refused: + brand + dmptprod + mdirect + rm + sts + volleyball + + Redirect to http: + etps + find + globalportal + smarket + u + us + v3 + --> - - - - - - - - - - - - - - - - - - - From 5daca07b40e39c89496ebde28ad94b5098066e7c Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 16:28:35 +0800 Subject: [PATCH 38/51] Update Samsung_Knox.xml --- src/chrome/content/rules/Samsung_Knox.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Knox.xml b/src/chrome/content/rules/Samsung_Knox.xml index affdd29169ad..12648a2fa2fb 100644 --- a/src/chrome/content/rules/Samsung_Knox.xml +++ b/src/chrome/content/rules/Samsung_Knox.xml @@ -1,13 +1,12 @@ + @@ -15,6 +14,7 @@ + From 771c0fe5e35d1fdae49352aeded60c95379a03f8 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 16:30:56 +0800 Subject: [PATCH 39/51] Update Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml index 9d9336fab013..659a944699c8 100644 --- a/src/chrome/content/rules/Samsung.com.xml +++ b/src/chrome/content/rules/Samsung.com.xml @@ -84,6 +84,8 @@ + + @@ -103,7 +105,7 @@ - From 93e904e79bf65d35608e50a1fe28d4fea13b8d6c Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 16:33:46 +0800 Subject: [PATCH 40/51] Update Samsung_Sem.xml --- src/chrome/content/rules/Samsung_Sem.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Sem.xml b/src/chrome/content/rules/Samsung_Sem.xml index 55baf027566d..675b64c0081f 100644 --- a/src/chrome/content/rules/Samsung_Sem.xml +++ b/src/chrome/content/rules/Samsung_Sem.xml @@ -1,16 +1,16 @@ - - - + + + From 8e1b1824c051bc05bd2d0059e7370ca341134261 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 16:36:46 +0800 Subject: [PATCH 41/51] Update Samsung_Techwin.xml --- src/chrome/content/rules/Samsung_Techwin.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Techwin.xml b/src/chrome/content/rules/Samsung_Techwin.xml index 464c3d99f2a8..a2dd91262ed4 100644 --- a/src/chrome/content/rules/Samsung_Techwin.xml +++ b/src/chrome/content/rules/Samsung_Techwin.xml @@ -3,6 +3,10 @@ Nonfunctional domains: - (www.)samsungtechwin.com (to http://www.hanwhatechwin.com/) + + Mismatch: + blog.samsungtechwin.com + eco.samsungtechwin.com --> @@ -10,7 +14,6 @@ - + From d60da920956e6438c36665c89725df72364f7f76 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 16:39:48 +0800 Subject: [PATCH 42/51] Update Samsung_Techwin.xml --- src/chrome/content/rules/Samsung_Techwin.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Samsung_Techwin.xml b/src/chrome/content/rules/Samsung_Techwin.xml index a2dd91262ed4..2d22a5ed3a97 100644 --- a/src/chrome/content/rules/Samsung_Techwin.xml +++ b/src/chrome/content/rules/Samsung_Techwin.xml @@ -14,6 +14,8 @@ - + + From 69418e6cb86ec20077cd99d40df4e4e9d46bceed Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 16:45:46 +0800 Subject: [PATCH 43/51] Update Samsung_Techwin.xml --- src/chrome/content/rules/Samsung_Techwin.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Samsung_Techwin.xml b/src/chrome/content/rules/Samsung_Techwin.xml index 2d22a5ed3a97..4286d5abcdcc 100644 --- a/src/chrome/content/rules/Samsung_Techwin.xml +++ b/src/chrome/content/rules/Samsung_Techwin.xml @@ -13,9 +13,13 @@ - + + + + From ab7246d4e0ca9391eb1b04b7c8e4f88c45422ac7 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 19:53:00 +0800 Subject: [PATCH 44/51] Update Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml index 659a944699c8..600a815b033c 100644 --- a/src/chrome/content/rules/Samsung.com.xml +++ b/src/chrome/content/rules/Samsung.com.xml @@ -84,7 +84,7 @@ - + @@ -105,7 +105,7 @@ - From 9fd9dd842a584f0b44e7a95118da4e64401296e8 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 19:59:54 +0800 Subject: [PATCH 45/51] Update Samsung_mySingle.xml --- src/chrome/content/rules/Samsung_mySingle.xml | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/rules/Samsung_mySingle.xml b/src/chrome/content/rules/Samsung_mySingle.xml index 30d33abe6503..c62f285d17eb 100644 --- a/src/chrome/content/rules/Samsung_mySingle.xml +++ b/src/chrome/content/rules/Samsung_mySingle.xml @@ -1,31 +1,34 @@ - - - From 2a231218928ba714421c0975d6d9da1d5730ad10 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 20:02:49 +0800 Subject: [PATCH 46/51] Update Samsung_CN.xml --- src/chrome/content/rules/Samsung_CN.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Samsung_CN.xml b/src/chrome/content/rules/Samsung_CN.xml index 9e205e149514..f17037499ed4 100644 --- a/src/chrome/content/rules/Samsung_CN.xml +++ b/src/chrome/content/rules/Samsung_CN.xml @@ -5,6 +5,7 @@ Non-2xx HTTP code: http://samsung.cn/ (200) => https://www.samsung.com/cn/ (403) Non-2xx HTTP code: http://www.samsung.cn/ (200) => https://www.samsung.com/cn/ (403) Non-2xx HTTP code: http://samsung.com.cn/ (200) => https://www.samsung.com/cn/ (403) + Non-2xx HTTP code: http://www.samsung.com.cn/ (200) => https://www.samsung.com.cn/ (403) Problematic domains: @@ -16,8 +17,6 @@ - - From 43ea81a6849b6f94aeadc8535744f30bf3a86712 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 20:14:46 +0800 Subject: [PATCH 47/51] Update Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml index 600a815b033c..252984a43f7b 100644 --- a/src/chrome/content/rules/Samsung.com.xml +++ b/src/chrome/content/rules/Samsung.com.xml @@ -131,11 +131,9 @@ - + - - @@ -149,6 +147,8 @@ + + From b469f6acaf86487a972db1d7c665e4901f6adc75 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 24 Aug 2016 20:16:55 +0800 Subject: [PATCH 48/51] Update Samsung_Sem.xml --- src/chrome/content/rules/Samsung_Sem.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Samsung_Sem.xml b/src/chrome/content/rules/Samsung_Sem.xml index 675b64c0081f..1130c47dff25 100644 --- a/src/chrome/content/rules/Samsung_Sem.xml +++ b/src/chrome/content/rules/Samsung_Sem.xml @@ -1,16 +1,19 @@ - - + + + From 101d1d1b7814d61c07cdc49aa23fcc36323762de Mon Sep 17 00:00:00 2001 From: renyouguo Date: Thu, 25 Aug 2016 09:50:01 +0800 Subject: [PATCH 49/51] Update AllShare_Play.xml --- src/chrome/content/rules/AllShare_Play.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/AllShare_Play.xml b/src/chrome/content/rules/AllShare_Play.xml index 63f33c32d21e..9e0d3b4338e6 100644 --- a/src/chrome/content/rules/AllShare_Play.xml +++ b/src/chrome/content/rules/AllShare_Play.xml @@ -12,10 +12,11 @@ - + - + + From 2da1b1dd9631f13faa292058b0cc8ec816241d6a Mon Sep 17 00:00:00 2001 From: renyouguo Date: Thu, 25 Aug 2016 09:52:42 +0800 Subject: [PATCH 50/51] Update Samsung.com.xml --- src/chrome/content/rules/Samsung.com.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Samsung.com.xml b/src/chrome/content/rules/Samsung.com.xml index 252984a43f7b..50198fbf8c46 100644 --- a/src/chrome/content/rules/Samsung.com.xml +++ b/src/chrome/content/rules/Samsung.com.xml @@ -50,8 +50,6 @@ - account - allshareplay - content - - img.content - - pub.content - findmymobile - images - nmetrics (→ samsung-com.112.2o7.net) @@ -74,6 +72,8 @@ Not exist: allshareplay.samsung.com chaton.samsung.com + img.content.samsung.com + pub.content.samsung.com findmymobile2.samsung.com web.samsungchaton.com --> @@ -158,7 +158,7 @@ Github issue: https://github.com/EFForg/https-everywhere/issues/309 --> - From 17764a4492309575c851e4f9dec2a0c48908bd4c Mon Sep 17 00:00:00 2001 From: renyouguo Date: Thu, 25 Aug 2016 09:55:20 +0800 Subject: [PATCH 51/51] Update Samsung_Techwin.xml --- src/chrome/content/rules/Samsung_Techwin.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Samsung_Techwin.xml b/src/chrome/content/rules/Samsung_Techwin.xml index 4286d5abcdcc..af2cf7e92061 100644 --- a/src/chrome/content/rules/Samsung_Techwin.xml +++ b/src/chrome/content/rules/Samsung_Techwin.xml @@ -13,12 +13,13 @@ - + +