CmF1472 · pull · Apr 13, 2020 · Apr 13, 2020 · Apr 13, 2020 · Apr 13, 2020
diff --git a/src/chrome/content/rules/126.net.xml b/src/chrome/content/rules/126.net.xml
@@ -10,7 +10,9 @@
 		imglf.ph.126.net
 		music.ph.126.net			https://music.ph.126.net/ph.js
 		file.ws.stu.126.net
-		imglf(\d).nosdn0.126.net	Equal to imglf$1.nosdn.127.net
+
+	Redirect to http:
+		easyread.ph.126.net
 
 	Refuse to connect:
 		m10.music.126.net			(Outside China)
@@ -35,35 +37,22 @@
 	<target host="s2.music.126.net" />
 	<target host="s3.music.126.net" />
 	<target host="s4.music.126.net" />
-	<target host="easyread.ph.126.net" />
-		<test url="http://easyread.ph.126.net/0jkjwGfV7I4EJXnYlRBkVg==/7917077456266817441.jpg" />
-	<target host="pimg1.126.net" />
-		<test url="http://pimg1.126.net/silver/product/fams/banner/902d4fad-7b08-4977-8cb4-501d0927811a.jpg" />
+	<target host="*.nosdn0.126.net" />
+		<test url="http://imglf3.nosdn0.126.net/img/WFU1VmZJa3UxeFltWTJ4ZDNOZDU4NXRmUFVLR1lXS1gySnpVQ2JObm95VjZjQjNGWVBjU2x3PT0.jpg" />
+		<test url="http://imglf4.nosdn0.126.net/img/WFU1VmZJa3UxeFltWTJ4ZDNOZDU4M2wwT05lSzRHZjZkN2RTOFMxOEFPVGRjTmlQdkRIcDlBPT0.jpg" />
+		<test url="http://imglf6.nosdn0.126.net/img/WFU1VmZJa3UxeFltWTJ4ZDNOZDU4K3VuTEdoMmZZcGJzR2YyMFdidWlsVFBlNWwzMlkzZTFnPT0.jpg" />
 	<target host="cst.stu.126.net" />
 		<test url="http://cst.stu.126.net/u/js/cms/reuglar.0.3.1.js" />
 	<target host="ct.stu.126.net" />
 	<target host="file.ws.126.net" />
 		<test url="http://file.ws.126.net/3g/client/netease_newsreader_android.apk" />
 	<target host="yuedust.yuedu.126.net" />
 
-	<!--
-		Mismatched:
-		get some img tests on
-		https://renwuzaoxing.lofter.com/
-			-->
+	<!--	Mismatched:	-->
 	<target host="s2.open.126.net" />
-
-	<target host="*.nosdn0.126.net" />
-
 	<rule from="^http://s2\.open\.126\.net/"
 			to="https://s2.open.163.com/" />
 		<test url="http://s2.open.126.net/ocb/css/style.css" />
 
-	<rule from="^http://imglf(\d+)\.nosdn0\.126\.net/"
-			to="https://imglf$1.nosdn.127.net/" />
-		<test url="http://imglf3.nosdn0.126.net/img/WFU1VmZJa3UxeFltWTJ4ZDNOZDU4NXRmUFVLR1lXS1gySnpVQ2JObm95VjZjQjNGWVBjU2x3PT0.jpg" />
-		<test url="http://imglf4.nosdn0.126.net/img/WFU1VmZJa3UxeFltWTJ4ZDNOZDU4M2wwT05lSzRHZjZkN2RTOFMxOEFPVGRjTmlQdkRIcDlBPT0.jpg" />
-		<test url="http://imglf6.nosdn0.126.net/img/WFU1VmZJa3UxeFltWTJ4ZDNOZDU4K3VuTEdoMmZZcGJzR2YyMFdidWlsVFBlNWwzMlkzZTFnPT0.jpg" />
-
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/163.com-mixedcontent.xml b/src/chrome/content/rules/163.com-mixedcontent.xml
@@ -2,10 +2,8 @@
 	For rules not causing problems, see 163.com.xml.
 -->
 <ruleset name="163.com-mixedcontent" platform="mixedcontent">
-	<target host="biz.163.com" />
-	<target host="money.163.com" />
+	<target host="live.163.com" />
 	<target host="i.money.163.com" />
-	<target host="b.you.163.com" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/163.com.xml b/src/chrome/content/rules/163.com.xml
@@ -5,25 +5,18 @@
 		gamer.163.com
 		zh.163.com
 
-	Break redirect:
-		baoxian.163.com		http -> www
-		piao.163.com		https -> https://baoxian.163.com/
-
-	Different http/https content:
-		mail.163.com
-
-	Expired:
-		developer.163.com
-		fm.163.com
-		api.t.163.com
-
 	Mixmatched:
 		support.dun.163.com
 		img.nie.163.com
 		res.nie.163.com
 		qiye.163.com
 		sitemap.163.com
 
+	Redirect to http:
+		developer.163.com
+		rec.g.163.com		http://rec.g.163.com/kaolaadclick/api/dsp/show.s
+		app.yuedu.163.com
+
 	Refused:
 		corp.163.com
 		gb.corp.163.com
@@ -46,35 +39,31 @@
 
 	Timeout:
 		^					https://travis-ci.org/EFForg/https-everywhere/jobs/522370910#L639
+		fankui.163.com		https://travis-ci.org/github/EFForg/https-everywhere/jobs/666649722#L409
 		game.campus.163.com
 		18.mail.163.com		https://travis-ci.org/EFForg/https-everywhere/jobs/522370910#L640
 		pimg.163.com		https://travis-ci.org/EFForg/https-everywhere/jobs/522370910#L641
-		yun.reg.163.com		https://travis-ci.org/EFForg/https-everywhere/jobs/420428803#L655
 		chat.study.163.com	https://travis-ci.org/EFForg/https-everywhere/jobs/522379611#L653
 -->
 <ruleset name="163.com">
 	<!-- Directly: -->
 	<target host="www.163.com" />
 	<target host="1.163.com" />
 	<target host="3g.163.com" />
-	<target host="888.163.com" />
 	<target host="adgeo.163.com" />
 	<target host="analytics.163.com" />
 	<target host="auto.163.com" />
-	<target host="caipiao.163.com" />
+	<target host="biz.163.com" />
 	<target host="cc.163.com" />
 	<target host="mshare.cc.163.com" />
 	<target host="dun.163.com" />
 	<target host="cdn.easyread.163.com" />
 	<target host="email.163.com" />
 	<target host="email2.163.com" />
-	<target host="fa.163.com" />
-	<target host="fankui.163.com" />
+	<target host="fm.163.com" />
 	<target host="help.163.com" />
 	<target host="iad.g.163.com" />
 		<test url="http://iad.g.163.com/wa/ad" />
-	<target host="rec.g.163.com" />
-		<test url="http://rec.g.163.com/kaolaadclick/api/dsp/show.s" />
 	<target host="game.163.com" />
 	<target host="gm.163.com" />
 		<target host="box.gm.163.com" />
@@ -98,7 +87,6 @@
 		<target host="xy3.gm.163.com" />
 		<target host="xyq.gm.163.com" />
 		<target host="y3.gm.163.com" />
-		<target host="zh.gm.163.com" />
 		<target host="zmq.gm.163.com" />
 	<target host="lady.163.com" />
 	<target host="love.163.com" />
@@ -113,38 +101,31 @@
 		<test url="http://iplocator.mail.163.com/iplocator?callback=fGetLocator" />
 	<target host="msg.mail.163.com" />
 	<target host="mima.163.com" />
+	<target host="money.163.com" />
 	<target host="music.163.com" />
+	<target host="open.163.com" />
 	<target host="www.qiye.163.com" />
 	<target host="dl.reg.163.com" />
 	<target host="hc.reg.163.com" />
 	<target host="webzj.reg.163.com" />
-	<!--target host="yun.reg.163.com" />
-		<test url="http://yun.reg.163.com/cloud/versions/1.0.0/cloudstyle.css" /-->
+	<target host="yun.reg.163.com" />
+		<test url="http://yun.reg.163.com/cloud/versions/1.0.0/cloudstyle.css" />
 	<target host="study.163.com" />
-	<target host="trip.163.com" />
 	<target host="vipmail.163.com" />
 	<target host="you.163.com" />
+	<target host="b.you.163.com" />
 	<target host="cps.you.163.com" />
 	<target host="open.you.163.com" />
 	<target host="m.you.163.com" />
 	<target host="yuedu.163.com" />
-	<target host="app.yuedu.163.com" />
-	<target host="zhidao.163.com" />
 
 	<!-- Complications: -->
 	<target host="163.com" />
 
-	<target host="open.163.com" />
-		<test url="http://open.163.com/special/" />
-		<!--	MCB by http://s2.open.126.net/ocb/css/style.css	-->
-		<exclusion pattern="http://open\.163\.com/special/(\S+)" />
-		<test url="http://open.163.com/special/opencourse/" />
-		<test url="http://open.163.com/special/opencourse/cs50.html" />
-		<test url="http://open.163.com/special/cuvocw/xiyoujijiedu.html" />
-
 	<target host="reg.163.com" />
 		<!--	Redirect to http:	-->
-		<exclusion pattern="http://reg\.163\.com/update\.html$" />
+		<exclusion pattern="http://reg\.163\.com/update\.html?$" />
+		<test url="http://reg.163.com/update.htm" />
 		<test url="http://reg.163.com/update.html" />
 
 	<rule from="^http://163\.com/" to="https://www.163.com/" />

diff --git a/src/chrome/content/rules/Ars-Technica.xml b/src/chrome/content/rules/Ars-Technica.xml
diff --git a/src/chrome/content/rules/ArsTechnica.co.uk.xml b/src/chrome/content/rules/ArsTechnica.co.uk.xml
@@ -0,0 +1,11 @@
+<!--
+	For other Condé Nast coverage, see Conde-Nast.xml.
+-->
+<ruleset name="ArsTechnica.co.uk (partial)">
+	<target host="arstechnica.co.uk" />
+	<target host="www.arstechnica.co.uk" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/ArsTechnica.com.xml b/src/chrome/content/rules/ArsTechnica.com.xml
@@ -0,0 +1,58 @@
+<!--
+	For other Condé Nast coverage, see Conde-Nast.xml.
+
+	Non-functional hosts
+		Couldn't connect to server:
+		- irc.arstechnica.com
+		- irc-nyc.arstechnica.com
+		- irc-sfo.arstechnica.com
+		- staging.arstechnica.com
+
+		Timeout was reached:
+		- origin.cdn.arstechnica.com
+		- live.arstechnica.com
+		- uk.live.arstechnica.com
+		- util.arstechnica.com
+
+		SSL connect error:
+		- feeds.arstechnica.com
+
+		SSL peer certificate was not OK:
+		- www.coins.arstechnica.com
+		- www.irc.arstechnica.com
+
+		Mixed content blocking (MCB) triggered:
+		- archive.arstechnica.com
+-->
+<ruleset name="ArsTechnica.com (partial)">
+	<target host="arstechnica.com" />
+	<target host="www.arstechnica.com" />
+	<target host="apps.arstechnica.com" />
+	<target host="cardboard.arstechnica.com" />
+	<target host="civis.arstechnica.com" />
+	<target host="cms.arstechnica.com" />
+	<target host="coins.arstechnica.com" />
+	<target host="dev.arstechnica.com" />
+	<target host="episteme.arstechnica.com" />
+	<target host="hq.arstechnica.com" />
+	<target host="jobs.arstechnica.com" />
+	<target host="link.arstechnica.com" />
+	<target host="m.arstechnica.com" />
+	<target host="media.arstechnica.com" />
+	<target host="origin.arstechnica.com" />
+	<target host="sstats.arstechnica.com" />
+	<target host="static.arstechnica.com" />
+		<test url="http://static.arstechnica.com/staff-directory/" />
+		<test url="http://static.arstechnica.com/store/" />
+	<target host="stats.arstechnica.com" />
+	<target host="stats2.arstechnica.com" />
+	<target host="store.arstechnica.com" />
+	<target host="video.arstechnica.com" />
+		<test url="http://video.arstechnica.com/genres/technology" />
+		<test url="http://video.arstechnica.com/watch/a-celebration-of-cassini/" />
+	<target host="write.arstechnica.com" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/ArsTechnica.net.xml b/src/chrome/content/rules/ArsTechnica.net.xml
@@ -0,0 +1,14 @@
+<!--
+	For other Condé Nast coverage, see Conde-Nast.xml.
+
+	Non-functional hosts
+		SSL peer certificate was not OK:
+		- static.arstechnica.net
+-->
+<ruleset name="ArsTechnica.net (partial)">
+	<target host="cdn.arstechnica.net" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>