Skip to content

Commit 2561f1e

Browse files
J0WIJ0WI
authored
Merge pull request EFForg#17177 from ivysrono/patch-770
Update QQ.xml
2 parents 02eb12f + 4a5676f commit 2561f1e

4 files changed

Lines changed: 192 additions & 156 deletions

File tree

‎src/chrome/content/rules/QQ.com-Problematic.xml‎

Lines changed: 93 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,103 @@
11
<!--
22
For other rulesets of QQ.com, see QQ.xml
3-
43
They don't have problem with https, just some problems are failing test.
4+
https://github.com/EFForg/https-everywhere/blob/master/utils/ruleset-whitelist.csv
55
-->
66
<ruleset name="QQ.com-Problematic">
7-
<target host="qq.com" />
8-
<target host="www.qq.com" />
97

10-
<securecookie host=".+" name=".+" />
8+
<target host="3gimg.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470970074#L757 -->
9+
10+
<target host="888.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470970074#L758 -->
11+
12+
<target host="aq.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470983224#L745 -->
13+
14+
<target host="js.aq.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471006999#L779 -->
15+
16+
<target host="act.daoju.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471006999#L780 -->
17+
<!-- test url="http://act.daoju.qq.com/act/a20180629traders/index.htm" /--> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470904700#L765 -->
18+
19+
<target host="js01.daoju.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470904700#L770 -->
20+
21+
<target host="js02.daoju.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470993622#L778 -->
22+
23+
<target host="dp3.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470904700#L771 -->
24+
25+
<target host="gamevip.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470983224#L746 -->
26+
27+
<target host="ke.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470904700#L772 -->
28+
29+
<target host="x.l.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470904700#L773 -->
30+
<!--test url="http://x.l.qq.com/unique.swf" /-->
31+
<!--test url="http://x.l.qq.com/web/jsproxy/uuser.html" /-->
32+
33+
<target host="open.map.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470994082#L779 -->
34+
35+
<target host="s.map.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470970074#L759 -->
36+
37+
<target host="minigame.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470983224#L747 -->
38+
<!--test url="http://minigame.qq.com/common_manage/381/big_image_2c247d2261206b6ae81ef1ccc7108582.jpg" /--> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470983224#L744 -->
39+
40+
<target host="mxm.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471268086#L751 -->
41+
42+
<target host="s.pc.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470970074#L760 -->
43+
<!--test url="http://s.pc.qq.com/discuz/css/style.css" /-->
44+
45+
<target host="pr.map.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471006999#L781 -->
46+
47+
<target host="ossweb-img.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471258085#L772 -->
48+
<!--test url="http://ossweb-img.qq.com/images/js/share/share.shtml" /--> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470993622#L777 -->
49+
<target host="ssl.ptlogin2.qq.com" /> <!--https://travis-ci.org/EFForg/https-everywhere/jobs/428157983#L776-->
50+
51+
<target host="qqgame.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470970074#L761 -->
1152

12-
<rule from="^http://qq\.com/" to="https://www.qq.com/" />
53+
<target host="open.qqgame.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471270093#L759 -->
54+
55+
<target host="img1.sj.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470904700#L773 -->
56+
<!--test url="http://img1.sj.qq.com/api/styles/sjqqapi.css" /-->
57+
58+
<target host="img2.sj.qq.com" />
59+
<!--test url="http://img2.sj.qq.com/api/scripts/sjqqapi.js" /--> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470994082#L777 -->
60+
61+
<target host="img3.sj.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470970074#L762 -->
62+
63+
<target host="img4.sj.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470904700#L776 -->
64+
65+
<target host="img5.sj.qq.com" />
66+
67+
<target host="img6.sj.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470904700#L777 -->
68+
69+
<target host="sqimg.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471258085#L773 -->
70+
71+
<target host="cdn.tencentgroup.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470994082#L781 -->
72+
<!--test url="http://cdn.tencentgroup.qq.com/join_static/ext/20170905/" /--> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470970074#L756 -->
73+
74+
<target host="v.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470970074#L763 -->
75+
<!-- Redirect to http -->
76+
<exclusion pattern="^http://v\.qq\.com/vplus/" />
77+
<test url="http://v.qq.com/vplus/colorsofchina" />
78+
79+
<target host="tj.video.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471006999#L782 -->
80+
<!--test url="http://tj.video.qq.com/fcgi-bin/set_cookie?otype=json" /-->
81+
82+
<target host="vip.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471006999#L783 -->
83+
84+
<target host="api.weixin.qq.com" /> <!--https://travis-ci.org/EFForg/https-everywhere/jobs/428177051#L775-->
85+
86+
<target host="open.weixin.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470983224#L748 -->
87+
88+
<target host="webpush.weixin.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470970074#L764 -->
89+
90+
<target host="cdn.wetest.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470904700#L779 -->
91+
92+
<target host="f.wetest.qq.com" /> <!--https://travis-ci.org/EFForg/https-everywhere/jobs/428198496#L772-->
93+
94+
<target host="wspeed.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/471258085#L774 -->
95+
96+
<target host="xx.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470983224#L749 -->
97+
98+
<target host="m.y.qq.com" /> <!-- https://travis-ci.org/EFForg/https-everywhere/jobs/470983224#L750 -->
99+
100+
<securecookie host=".+" name=".+" />
13101

14102
<rule from="^http:" to="https:" />
15103
</ruleset>

‎src/chrome/content/rules/QQ.com-mixedcontent.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
<ruleset name="QQ.com (mixed content)" platform="mixedcontent">
55
<target host="1.qq.com" />
66
<test url="http://1.qq.com/mall/lottery.shtml" />
7-
<target host="cb.qq.com" />
8-
<target host="daju.qq.com" />
7+
<target host="dajia.qq.com" />
98
<target host="games.qq.com" />
109
<test url="http://games.qq.com/mobile/" />
11-
<target host="gamevip.qq.com" />
12-
<target host="view.news.qq.com" /><!-- break login button and so on -->
13-
<target host="qqgame.qq.com" /><!-- break login button -->
10+
<target host="igame.qq.com" />
11+
<test url="http://igame.qq.com/login.php?u1=http://igame.qq.com/center/index.php" />
12+
<target host="iwan.qq.com" />
1413
<target host="qzs.qq.com" />
1514
<target host="shang.qq.com" />
1615
<target host="cache.tv.qq.com" />

0 commit comments

Comments
 (0)