Merge pull request EFForg#5782 from renyouguo/patch-165

J0WI · web-flow · commit adbea2dfba16 · 2016-07-24T13:58:25.000+02:00
Update iqiyi.com.xml and Creat iQiyi_cn.xml
diff --git a/src/chrome/content/rules/iQiyi_CN.xml b/src/chrome/content/rules/iQiyi_CN.xml
@@ -0,0 +1,28 @@
+<!--
+	Might be blocked by The Great Fire Wall (GFW) in China.
+	Check error: 28, 'Operation timed out after 0 milliseconds with 0 out of 0 bytes received'
+	Check error: 35, 'gnutls_handshake() failed: Error in the pull function.'
+	Test in Tor broswer 6.0.2, Ok by http, however, unable to connect to https.
+	Users could turn on this rule to test by youself.
+-->
+
+<ruleset name="iQiyi_CN" default_off="Only avaiable in China">
+
+	<target host="static.iqiyi.com" />
+		<test url="http://static.iqiyi.com/css/common/basic_css/basic.css" />
+		<test url="http://static.iqiyi.com/js/pingback/qa.js" />
+
+	<target host="www.iqiyi.com" />
+	<exclusion pattern="^http://www\.iqiyi\.com/(?!favicon\.ico|player\/cupid\/common\/clear\.swf|common\/flashplayer\/(.+)\.swf)" />
+		<test url="http://www.iqiyi.com/" />
+		<test url="http://www.iqiyi.com/dianying/" />
+		<test url="http://www.iqiyi.com/dianshiju/" />
+		<test url="http://www.iqiyi.com/weidianying/" />
+		<test url="http://www.iqiyi.com/favicon.ico/" />
+		<test url="http://www.iqiyi.com/player/cupid/common/clear.swf" />
+		<test url="http://www.iqiyi.com/common/flashplayer/20160719/1206f98c2359.swf" />
+		<test url="http://www.iqiyi.com/common/flashplayer/20150810/seed-3-0-3.swf" />
+
+	<rule from="^http:" to="https:" />
+
+</ruleset>
diff --git a/src/chrome/content/rules/iqiyi.com.xml b/src/chrome/content/rules/iqiyi.com.xml
@@ -1,6 +1,10 @@
 <!--
+	Other rulesets:
+		- iQiyi_CN.xml
+		- qiyi.xml
+		- reference: https://github.com/EFForg/https-everywhere/pull/4801#issuecomment-219402538
+	
 	Nonfunctional hosts in *iqiyi.com:
-
 		- ad ᵇ
 		- app ʳ
 		- auto ᵇ
@@ -32,68 +36,37 @@
 		- yule ᵇ
 		- zhaopin ᵇ
 		- zuozhe ᵈ
-
 	ᵇ Shows default page
 	ᵈ Dropped
 	ʳ Refused
 
-
 	^iqiyi.com: Mismatched
-
+	mbdapp.iqiyi.com: 404 not found.
 
 	Insecure cookies are set for these domains and hosts:
-
 		- .iqiyi.com
 		- passport.iqiyi.com
 
-
 	Mixed content:
-
 		- css, on:
-
 			- passport, www from static.iqiyi.com ˢ
 			- passport from static.qiyi.com
-
 		- Images, on:
-
 			- passport from $self ˢ
 			- passport from qiyipic.iqiyi.com ˢ
 			- passport, www from www.qiyipic.com
 			- www from pic\d.qiyipic.com
-
 	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
-
 -->
+
 <ruleset name="iQiyi.com (partial)" platform="mixedcontent">
 
-	<!--	Direct rewrites:
-				-->
-	<target host="mbdapp.iqiyi.com" />
 	<target host="passport.iqiyi.com" />
 	<target host="qiyipic.iqiyi.com" />
-	<target host="static.iqiyi.com" />
-	<target host="www.iqiyi.com" />
-
-	<!--	Complications:
-				-->
-	<target host="iqiyi.com" />
-
-		<test url="http://qiyipic.iqiyi.com/common/fix/public_images/logoCommon.png" />
-		<test url="http://static.iqiyi.com/css/common/basic_css/basic.css" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^\.iqiyi\.com$" name="^(?:P|QC)\d+$" /-->
-	<!--securecookie host="^passport\.iqiyi\.com$" name="^JSESSIONID$" /-->
+		<test url="http://qiyipic.iqiyi.com/common/fix/public_images/logoCommon.png" />	
 
 	<securecookie host="^\w" name="." />
-
-
-	<rule from="^http://iqiyi\.com/"
-		to="https://www.iqiyi.com/" />
-
-	<rule from="^http:"
-		to="https:" />
+	
+	<rule from="^http:" to="https:" />
 
 </ruleset>
