Merge pull request EFForg#1996 from finaljason/fix-rtl

jsha · jsha · commit c4051c7ad301 · 2015-06-26T09:55:53.000-07:00
fix and rewrite RTL.de (EFForg#1994)
diff --git a/src/chrome/content/rules/RTL.de.xml b/src/chrome/content/rules/RTL.de.xml
@@ -7,15 +7,21 @@
 			- bilder.akamai
 
 
-	(www.): refused
-
-
 	Problematic subdomains:
 
 		- bilder.akamai *
+		- (www.) ¹
+		- intentium ²
+		- kommunikation ²
+		- rtl-living ³
+		- rtl-crime ³
+		- spiele.rtl.de ¹
+		- gzsz.rtl.de ¹
 
 	* Works, akamai
-
+	¹ mixed content blocking (requires active content from bilder.akamai)
+	² bad cert domain
+	³ refused
 
 	Fully covered subdomains:
 
@@ -25,16 +31,19 @@
 		- rtl-videoclip-player
 
 -->
-<ruleset name="RTL.de (partial)">
-
-	<target host="*.rtl.de" />
-		<!--exclusion pattern="^http://www\.rtl\.de/" /-->
+<ruleset name="RTL.de (partial)" >
 
+	<target host="autoimg.rtl.de" />
+	<target host="bilder.rtl.de" />
+	<target host="bilder.akamai.rtl.de" />
+	<target host="rtl-videoclip-player.rtl.de" />
 
 	<rule from="^http://bilder\.akamai\.rtl\.de/"
-		to="https://a248.e.akamai.net/f/610/6737/8/bilder.akamai.net/" />
-
-	<rule from="^http://(autoimg|bilder|rtl-videoclip-player)\.rtl\.de/"
-		to="https://$1.rtl.de/" />
+		to="https://a248.e.akamai.net/f/610/6737/8/bilder.akamai.rtl.de/" />
 
+	<rule from="^http:"
+		to="https:" />
+	
+	<test url="http://a248.e.akamai.net/f/610/6737/8/bilder.akamai.rtl.de/" />
+	
 </ruleset>
