[Qz.com] Don't force !www, enumerate, squish, add img, add/update comments, cosmetics

MB · MB · commit da623700bbf6 · 2015-12-13T22:00:00.000Z
diff --git a/src/chrome/content/rules/Qz.com.xml b/src/chrome/content/rules/Qz.com.xml
@@ -3,43 +3,44 @@
 
 		- wac.35fb.edgecastcdn.net/??35FB/
 
-			- app
-			- img
 
-
-	Nonfunctional subdomains:
+	Nonfunctional hosts in *qz.com:
 
 		- app *
-		- img *
 
-	* EdgeCast
+	* 404
 
 
 	Mixed content:
 
 		- css, on ^ from:
 
-			- app ¹
+			- app.qz.com ¹
 			- fonts.googleapis.com ²
 
-		- favicon, on ^ from \d.gravatar.com ²
+		- favicon, on ^ from app.qz.com ²
+		- Bug on ^ from b.scorecardresearch.com ²
 
 	¹ Unsecurable <= 404
 	² Secured by us
 
 -->
 <ruleset name="Qz.com (partial)" default_off="mismatched" platform="mixedcontent">
 
+	<!--	Direct rewrites:
+				-->
 	<target host="qz.com" />
-	<target host="*.qz.com" />
+	<target host="www.qz.com" />
+
+	<!--	Complications:
+				-->
+	<target host="img.qz.com" />
 
 
-	<rule from="^http://(?:www\.)?qz\.com/"
-		to="https://qz.com/" />
+	<rule from="^http://img\.qz\.com/"
+		to="https://qzprod.files.wordpress.com/" />
 
-	<!--	Protocol-relative links:
-						-->
-	<rule from="^https://img\.qz\.com/"
-		to="http://img.qz.com/" downgrade="1" />
+	<rule from="^http:"
+		to="https:" />
 
 </ruleset>
diff --git a/utils/downgrade-whitelist.txt b/utils/downgrade-whitelist.txt
@@ -22,7 +22,6 @@ Nextag (self-signed)
 NYTimes.com (needs ruleset tests)
 Oak Ridge National Laboratory (partial)
 Phoronix.com (partial)
-Qz.com (partial)
 SRG SSR (partial)
 Stack Exchange (partial)
 University of Alaska Anchorage (partial)
