From cda4300dc95bd3d924083793a2e79c6f457cc114 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Mon, 12 Sep 2016 10:46:53 +0800 Subject: [PATCH 01/13] Update QQ.xml --- src/chrome/content/rules/QQ.xml | 113 ++++++++++++++------------------ 1 file changed, 50 insertions(+), 63 deletions(-) diff --git a/src/chrome/content/rules/QQ.xml b/src/chrome/content/rules/QQ.xml index e40c2ea6c1fb..55091b1e43ae 100644 --- a/src/chrome/content/rules/QQ.xml +++ b/src/chrome/content/rules/QQ.xml @@ -1,6 +1,6 @@ - - + + + + - - - - - - - + + + + + + - + - + + + + @@ -301,51 +302,37 @@ - - + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - + + From 01d13bcb87ac1f0d7d265ed06d2bc27328059a98 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Mon, 12 Sep 2016 10:47:51 +0800 Subject: [PATCH 02/13] Update QQ.com-mixedcontent.xml --- .../content/rules/QQ.com-mixedcontent.xml | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/rules/QQ.com-mixedcontent.xml b/src/chrome/content/rules/QQ.com-mixedcontent.xml index 76a60a6216ef..f679ddfb198a 100644 --- a/src/chrome/content/rules/QQ.com-mixedcontent.xml +++ b/src/chrome/content/rules/QQ.com-mixedcontent.xml @@ -1,29 +1,33 @@ + - - + - - - - - From 24710ec571db9ac5d9cad92cf41e4c685a6dd149 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Mon, 12 Sep 2016 10:52:40 +0800 Subject: [PATCH 03/13] Update Qlogo.cn.xml --- src/chrome/content/rules/Qlogo.cn.xml | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/rules/Qlogo.cn.xml b/src/chrome/content/rules/Qlogo.cn.xml index a4482510895c..4a28d3e1cd40 100644 --- a/src/chrome/content/rules/Qlogo.cn.xml +++ b/src/chrome/content/rules/Qlogo.cn.xml @@ -1,19 +1,24 @@ + - - - - @@ -22,14 +27,9 @@ - - - - + From 2f156d71e9be80f299952daae22e8b5fccef36e6 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Mon, 12 Sep 2016 10:53:59 +0800 Subject: [PATCH 04/13] Update Qpic.cn.xml --- src/chrome/content/rules/Qpic.cn.xml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/rules/Qpic.cn.xml b/src/chrome/content/rules/Qpic.cn.xml index e75fbe7288ed..4acabe717759 100644 --- a/src/chrome/content/rules/Qpic.cn.xml +++ b/src/chrome/content/rules/Qpic.cn.xml @@ -1,23 +1,25 @@ - - + + - - + - - + From a0ece46199dbf9c37de1c8d5de97929a2eb245ea Mon Sep 17 00:00:00 2001 From: renyouguo Date: Mon, 12 Sep 2016 10:54:32 +0800 Subject: [PATCH 05/13] Update Gtimg.cn.xml --- src/chrome/content/rules/Gtimg.cn.xml | 51 +++++++++++++++++---------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/src/chrome/content/rules/Gtimg.cn.xml b/src/chrome/content/rules/Gtimg.cn.xml index cc7a7948eada..38d3bfd09b3b 100644 --- a/src/chrome/content/rules/Gtimg.cn.xml +++ b/src/chrome/content/rules/Gtimg.cn.xml @@ -1,4 +1,5 @@ + - + + + - - + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - - - - - From fc061145512a68c5c89eb71ca401d15c7cb007bf Mon Sep 17 00:00:00 2001 From: renyouguo Date: Mon, 12 Sep 2016 10:55:21 +0800 Subject: [PATCH 06/13] Create Tencent_CN.xml --- src/chrome/content/rules/Tencent_CN.xml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/chrome/content/rules/Tencent_CN.xml diff --git a/src/chrome/content/rules/Tencent_CN.xml b/src/chrome/content/rules/Tencent_CN.xml new file mode 100644 index 000000000000..89e6f0adb2a3 --- /dev/null +++ b/src/chrome/content/rules/Tencent_CN.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + From 46b932b4486e2a63f74d876685194d97bbba4866 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Mon, 12 Sep 2016 18:11:36 +0800 Subject: [PATCH 07/13] Update QQ.com-mixedcontent.xml --- src/chrome/content/rules/QQ.com-mixedcontent.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/chrome/content/rules/QQ.com-mixedcontent.xml b/src/chrome/content/rules/QQ.com-mixedcontent.xml index f679ddfb198a..84f6540d93ff 100644 --- a/src/chrome/content/rules/QQ.com-mixedcontent.xml +++ b/src/chrome/content/rules/QQ.com-mixedcontent.xml @@ -2,12 +2,10 @@ For rules not causing MCB, see QQ.xml. - Mismatch: + Invalid certificate: m.ac.qq.com p.y.qq.com service.qq.com - - SSL error: m.v.qq.com (51, "SSL: no alternative certificate subject name matches target host name 'm.v.qq.com'") Only avaiable in China: From df9f49ee8a6342f3b8a8511a2be29e89cecc77a1 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Mon, 12 Sep 2016 18:12:28 +0800 Subject: [PATCH 08/13] Update Qlogo.cn.xml --- src/chrome/content/rules/Qlogo.cn.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Qlogo.cn.xml b/src/chrome/content/rules/Qlogo.cn.xml index 4a28d3e1cd40..f0e2e62b03ca 100644 --- a/src/chrome/content/rules/Qlogo.cn.xml +++ b/src/chrome/content/rules/Qlogo.cn.xml @@ -2,10 +2,8 @@ 502: wx (get test from club.fir.im : http://wx.qlogo.cn/mmopen/PiajxSqBRaEJmzddrgRDEwqtNgZl6F4wKLR00a7FM21ZCwiciaAjChmWBmK9Sv3CAQCZyn0icNdaImAsBliaj723sow/0) - Mismatch: + Invalid certificate: q[1-4] - - SSL error: shp ( Test: http://shp.qlogo.cn/ttsing/40297318/40297318/ ) May stop the auto check: From 510aea982a99c63352c0829e4c52836f8274b6ac Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 14 Sep 2016 19:37:00 +0800 Subject: [PATCH 09/13] Update Tencent_CN.xml Test again. --- src/chrome/content/rules/Tencent_CN.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Tencent_CN.xml b/src/chrome/content/rules/Tencent_CN.xml index 89e6f0adb2a3..c1820079439a 100644 --- a/src/chrome/content/rules/Tencent_CN.xml +++ b/src/chrome/content/rules/Tencent_CN.xml @@ -4,7 +4,7 @@ Users could turn on this rule to test by youself. --> - + - + @@ -18,6 +17,9 @@ + + + From 20c9694c6a54a13cb36267538cac103d0434aeab Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 14 Sep 2016 19:56:26 +0800 Subject: [PATCH 12/13] Update QQ.xml --- src/chrome/content/rules/QQ.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/QQ.xml b/src/chrome/content/rules/QQ.xml index 55091b1e43ae..4c7c064b6cbf 100644 --- a/src/chrome/content/rules/QQ.xml +++ b/src/chrome/content/rules/QQ.xml @@ -144,7 +144,9 @@ - js01.daoju ² - js02.daoju ² - dldir2 ² + - cnc.exmail ² - service.exmail ² + - tel.exmail ² - film ³ - g ² - gaauth ² @@ -250,14 +252,16 @@ - + + + - + From 54588fa52b73357b02ee60ceb4802d9fd9506234 Mon Sep 17 00:00:00 2001 From: renyouguo Date: Wed, 14 Sep 2016 20:19:25 +0800 Subject: [PATCH 13/13] Update Gtimg.cn.xml --- src/chrome/content/rules/Gtimg.cn.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Gtimg.cn.xml b/src/chrome/content/rules/Gtimg.cn.xml index 38d3bfd09b3b..e72ec24fcf34 100644 --- a/src/chrome/content/rules/Gtimg.cn.xml +++ b/src/chrome/content/rules/Gtimg.cn.xml @@ -53,6 +53,6 @@ - +