Update Sinaimg.cn.xml (#14972)

* Update Sinaimg.cn.xml * Update Sinaimg.cn.xml * Update Sinaimg.cn.xml * Update Sinaimg.cn.xml * Update Sinaimg.cn.xml * Update Sinaimg.cn.xml * Update Sinaimg.cn.xml
EFForg · Apr 6, 2018 · abb6180 · abb6180
1 parent cdf9252
commit abb6180
Showing 1 changed file with 43 additions and 28 deletions.
diff --git a/src/chrome/content/rules/Sinaimg.cn.xml b/src/chrome/content/rules/Sinaimg.cn.xml
@@ -5,14 +5,17 @@
 		u1.sinaimg.cn.cdngc.net
 		gongyi.sinaimg.cn
 		henan.sinaimg.cn	https://henan.sinaimg.cn/16/2010/0604/U4314P827T16D8548F242DT20100604175637.jpg
-		jiangxi.sinaimg.cn	https://jiangxi.sinaimg.cn/2013/0619/S92318T1371614052459.pdf
-		sh.sinaimg.cn	https://sh.sinaimg.cn/2014/0819/IsSh.js
+		i[0-3].sinaimg.cn	https://travis-ci.org/EFForg/https-everywhere/jobs/362611354#L732
 		r[1-4].sinaimg.cn	https://r1.sinaimg.cn/201512/000/000/aHR0cDovL21tYml6LnFwaWMuY24vbW1iaXovT3VwQW81cVd0aWNMTUdpY0podWNJMnpmUXd3eEZFRGhGQ2Q2WlNuR25SRmRCZERqNlJQN1Nha3U1UHdGRlZXbWRDS09kajRKZXU2eG03YXZ4VDNlMW4xZy8wP3d4X2ZtdD1qcGVnK2h0dHA6Ly9tcC53ZWl4aW4ucXEuY29tL3M/X19iaXo9TXpBM01UY3dPREEwTnc9PSZtaWQ9NDAyMzI2OTk0JmlkeD0xJnNuPTE4OWZjZTkwZGE5YmU5MGNjODk1ZDJlOGQ4OTM3N2Ex.jpg
-		www.sinaimg.cn	( Uses Akamai outside the Chinese GFW, something else inside the GFW that doesn't get a mismatch. )
+		s[1-16].sinaimg.cn	( Some IPs may be mismatched. Equal to ss[1-16].sinaimg.cn )
 -->
 <ruleset name="Sinaimg.cn">
 	<!--	Directly:	-->
+	<target host="www.sinaimg.cn" />
 	<target host="wwws.sinaimg.cn" />
+	<target host="jiangxi.sinaimg.cn" />
+	<target host="sh.sinaimg.cn" />
+
 	<target host="d0.sinaimg.cn" />
 	<target host="d1.sinaimg.cn" />
 	<target host="d2.sinaimg.cn" />
@@ -24,10 +27,6 @@
 	<target host="d8.sinaimg.cn" />
 	<target host="d9.sinaimg.cn" />
 	<target host="h5.sinaimg.cn" />
-	<target host="i0.sinaimg.cn" />
-	<target host="i1.sinaimg.cn" />
-	<target host="i2.sinaimg.cn" />
-	<target host="i3.sinaimg.cn" />
 	<target host="i0s.sinaimg.cn" />
 	<target host="i1s.sinaimg.cn" />
 	<target host="i2s.sinaimg.cn" />
@@ -59,22 +58,6 @@
 	<target host="portrait6.sinaimg.cn" />
 	<target host="portrait7.sinaimg.cn" />
 	<target host="portrait8.sinaimg.cn" />
-	<target host="s1.sinaimg.cn" />
-	<target host="s2.sinaimg.cn" />
-	<target host="s3.sinaimg.cn" />
-	<target host="s4.sinaimg.cn" />
-	<target host="s5.sinaimg.cn" />
-	<target host="s6.sinaimg.cn" />
-	<target host="s7.sinaimg.cn" />
-	<target host="s8.sinaimg.cn" />
-	<target host="s9.sinaimg.cn" />
-	<target host="s10.sinaimg.cn" />
-	<target host="s11.sinaimg.cn" />
-	<target host="s12.sinaimg.cn" />
-	<target host="s13.sinaimg.cn" />
-	<target host="s14.sinaimg.cn" />
-	<target host="s15.sinaimg.cn" />
-	<target host="s16.sinaimg.cn" />
 	<target host="ss1.sinaimg.cn" />
 	<target host="ss2.sinaimg.cn" />
 	<target host="ss3.sinaimg.cn" />
@@ -130,9 +113,12 @@
 	<target host="z8.sinaimg.cn" />
 	<target host="z9.sinaimg.cn" />
 
+		<test url="http://www.sinaimg.cn/cj/pc/2007-10-19/32/U453P31T32D36393F1538DT20071019102225.pdf" />
+		<test url="http://www.sinaimg.cn/dy/weather/main/w2015/wt_switch2.png" />
+		<test url="http://jiangxi.sinaimg.cn/2013/0619/S92318T1371614052459.pdf" />
+		<test url="http://sh.sinaimg.cn/2014/0819/IsSh.js" />
 		<test url="http://d0.sinaimg.cn/pfpghc/a0e6ccaf907445459a70b275444894a9.jpg" />
 		<test url="http://h5.sinaimg.cn/m/videoPlayer/js/app.c7e9c480.js" />
-		<test url="http://i0.sinaimg.cn/cha/images/c.gif" />
 		<test url="http://i0s.sinaimg.cn/dy/weather/main/index14/007/blk8_dots.gif" />
 		<test url="http://k.sinaimg.cn/n/sports/transform/20160705/8oyb-fxtsats1568094.jpg/w5707c6.jpg" />
 		<test url="http://ks.sinaimg.cn/n/ent/20161213/rIVK-fxypipt1161081.jpg/w640h320z1l50t1dcc.jpg" />
@@ -144,7 +130,6 @@
 		<test url="http://ns.sinaimg.cn/news/transform/20160504/mHkI-fxrtztc3215730.jpg" />
 		<test url="http://p1.sinaimg.cn/1679869477/180/94201408034020" />
 		<test url="http://portrait1.sinaimg.cn/6004496926/blog/50" />
-		<test url="http://s1.sinaimg.cn/orignal/001PGyMZzy6LeICm9HHe9" />
 		<test url="http://ss1.sinaimg.cn/orignal/001O7HQgzy6M5no8anw7a" />
 		<test url="http://tp1.sinaimg.cn/5554103544/180/0/1" />
 		<test url="http://tva1.sinaimg.cn/crop.0.0.798.798.180/6462d00fgw1egno4hgy6wj20m80m8mxn.jpg" />
@@ -158,9 +143,39 @@
 		<test url="http://z0.sinaimg.cn/auto/resize?size=560_0&amp;img=http://sinastorage.com/storage.miaosha.sina.com.cn/products/201701/71a54447d99e17e3324ad1cb92d00c16.jpg" />
 
 	<!--	Complication:	-->
-	<target host="www.sinaimg.cn" />
-	<rule from="^http://www\.sinaimg\.cn/" to="https://wwws.sinaimg.cn/" />
-		<test url="http://www.sinaimg.cn/dy/weather/main/w2015/wt_switch2.png" />
+
+	<target host="i0.sinaimg.cn" />
+	<target host="i1.sinaimg.cn" />
+	<target host="i2.sinaimg.cn" />
+	<target host="i3.sinaimg.cn" />
+
+	<rule from="^http://i(0|1|2|3)\.sinaimg\.cn/" to="https://i$1s.sinaimg.cn/" />
+		<test url="http://i0.sinaimg.cn/cha/images/c.gif" />
+		<test url="http://i1.sinaimg.cn/cha/images/c.gif" />
+		<test url="http://i2.sinaimg.cn/cha/images/c.gif" />
+		<test url="http://i3.sinaimg.cn/cha/images/c.gif" />
+
+	<target host="s1.sinaimg.cn" />
+	<target host="s2.sinaimg.cn" />
+	<target host="s3.sinaimg.cn" />
+	<target host="s4.sinaimg.cn" />
+	<target host="s5.sinaimg.cn" />
+	<target host="s6.sinaimg.cn" />
+	<target host="s7.sinaimg.cn" />
+	<target host="s8.sinaimg.cn" />
+	<target host="s9.sinaimg.cn" />
+	<target host="s10.sinaimg.cn" />
+	<target host="s11.sinaimg.cn" />
+	<target host="s12.sinaimg.cn" />
+	<target host="s13.sinaimg.cn" />
+	<target host="s14.sinaimg.cn" />
+	<target host="s15.sinaimg.cn" />
+	<target host="s16.sinaimg.cn" />
+
+	<rule from="^http://s(\d+)\.sinaimg\.cn/" to="https://ss$1.sinaimg.cn/" />
+		<test url="http://s1.sinaimg.cn/orignal/001PGyMZzy6LeICm9HHe9" />
+		<test url="http://s2.sinaimg.cn/mw690/0042rM3Xzy6HBCst4Um8e" />
+		<test url="http://s16.sinaimg.cn/middle/4cd04747nb1d3a3b7637d" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>