Update MSN.xml (EFForg#9633)

* Update MSN.xml * Removed some old rules and targets * Removed what cause travis to fail * Put back working subdomains * Added removed subdomains to comment above ruleset * Added back subdomains, added to the top comment * Re-removed problem targets * Update MSN.xml * Update MSN.xml
BlauerHunger · May 2, 2017 · 39f74b1 · 39f74b1
1 parent c010ccc
commit 39f74b1
Showing 1 changed file with 14 additions and 29 deletions.
diff --git a/src/chrome/content/rules/MSN.xml b/src/chrome/content/rules/MSN.xml
@@ -48,6 +48,10 @@
 			- ads
 			- ads1 *
 			- fp.images.autos **
+			- bedrockformsemea ⁵
+			- bedrockformsemeanext ⁵
+			- bedrockformssg ⁵
+			- bedrockformssgnext ⁵
 			- br *
 			- causes **
 			- cityofspeed **
@@ -56,6 +60,7 @@
 			- estc			(404, akamai)
 			- fitbie		(503, akamai)
 			- healthyliving *
+			- imgs1-video.ssl.catalog.video *
 			- jp
 			- ads1.jp		(404, valid cert)
 			- sankei.jp *
@@ -67,6 +72,7 @@
 			- money			(refused)
 			- investing.money	(dropped)
 			- onmobile		(refused)
+			- c.sg *
 			- sgst[cj]		(504, akamai)
 			- signout *
 			- specials
@@ -84,8 +90,8 @@
 			- stjjp *
 			- vfcdn **
 			- video			(503, akamai)
+			- catalog.video *
 			- hub.video		(503, akamai)
-			- www			(blank page, akamai)
 			- co3.www *
 			- wx			(404, valid cert)
 
@@ -113,6 +119,7 @@
 	** 400
 	*** Reset
 	⁴ 503, akamai; !www redirects to www
+	⁵ Travis error 6: 'Could not resolve host'
 
 
 	Problematic hosts in *msn.com:
@@ -135,6 +142,7 @@
 		- c.sg				(mismatched, CN: c.msn.co.jp)
 		- static.stratosphere		(mismatched, CN: images.partner.windowsphone.com)
 		- img[123].catalog.video *
+		- imgs1-video (Mismatched)
 		- wonderwall			Expired, Untrusted root
 
 	* Works, akamai
@@ -166,14 +174,12 @@
 
 	<!--	Direct rewrites:
 				-->
+	<target host="msn.com" />
+	<target host="www.msn.com" />
 	<target host="adserver.msn.com" />
 	<target host="bedrockbluenext.msn.com" />
 	<target host="bedrockformsbluenext.msn.com" />
-	<target host="bedrockformsemea.msn.com" />
-	<target host="bedrockformsemeanext.msn.com" />
 	<target host="bedrockformskaw.msn.com" />
-	<target host="bedrockformssg.msn.com" />
-	<target host="bedrockformssgnext.msn.com" />
 	<target host="blstc.msn.com" />
 	<target host="c.msn.com" />
 	<target host="*.secure.co1.msn.com" />
@@ -201,34 +207,20 @@
 	<target host="byfiles.storage.msn.com" />
 
 	<target host="udc.msn.com" />
-	<target host="catalog.video.msn.com" />
 	<target host="*.ssl.catalog.video.msn.com" />
-	<!--target host="www.msn.com" /-->
 
 	<!--	Complications:
 				-->
 	<target host="h.msn.com" />
-	<target host="imgs1-video.msn.com" />
 	<target host="c.jp.msn.com" />
-
-	<target host="c.sg.msn.com" />
 	<target host="static.stratosphere.msn.com" />
 
-		<!--exclusion pattern="^http://www.msnbc.msn.com/(?!id/)" /-->
-
-		<test url="http://login.secure.co1.msn.com/" />
 		<test url="http://otf.msn.com/c.gif?js=&amp;evt=&amp;di=&amp;pi=&amp;ps=&amp;su=&amp;pageid=&amp;mkt=&amp;pn=&amp;mv=&amp;pp=&amp;cv.product=&amp;cv.partner=&amp;cv.publcat=&amp;st.dpt=&amp;st.sdpt=&amp;dv.Title1=&amp;cts=&amp;rf=&amp;rid=&amp;cvs=&amp;subcvs=&amp;cv.entityId=&amp;cv.entitySrc=&amp;provid=&amp;ar=&amp;d.dgk=&amp;d.imd=&amp;cv.parentId=&amp;isCorePV=&amp;pgIdx=&amp;pgTot=&amp;activityId=" />
 
-		<!--	Mismatched assets:
-					-->
-		<!--test url="http://www.msn.com/en-us/money/realestate/what-happened-to-these-famous-movie-homes/ss-BBlTeEO" /-->
-
 		<!--	Sets insecure cookies:
 						-->
 		<test url="http://c.msn.com/c.gif?udc=true&amp;rid=&amp;rnd=&amp;rf=&amp;tp=&amp;di=&amp;lng=&amp;cv.product=&amp;pn=&amp;activityId=&amp;d.dgk=&amp;d.imd=0" />
 
-
-
 	<!--	Not secured by server:
 
 		(MUID: Set by c.msn.com)
@@ -242,20 +234,13 @@
 	<securecookie host="^\.msn\.com$" name="^(?:MUID|s_\w+)$" />
 	<!--securecookie host="^\.msn\.com$" name="(cbus|Sample)$" /-->
 	<securecookie host="^(?:\.c|now|preview|\.bat\.r)\.msn\.com$" name="." />
-
-
-	<rule from="^http://c\.(?:jp|sg)\.msn\.com/"
-		to="https://c.msn.co.jp/" />
-
-	<!--rule from="^http://\w\w\.c\.msn\.com/"
-		to="https://c.msn.com/" /-->
+
+	<rule from="^http://c\.jp\.msn\.com/"
+		  to="https://c.msn.co.jp/" />
 
 	<rule from="^http://h\.msn\.com/"
 		to="https://h.live.com/" />
 
-	<rule from="^http://imgs1-video\.msn\.com/"
-		to="https://imgs1-video.ssl.catalog.video.msn.com/" />
-
 	<rule from="^http://static\.stratosphere\.msn\.com/"
 		to="https://az29590.vo.msecnd.net/" />