Update FAZ ruleset (#18859)

* Update FAZ ruleset

* Add targets

Author: Jochen-A-Fuerbacher

src/chrome/content/rules/FAZ-mismatches.xml

@@ -1,83 +1,78 @@
 <!--
-	See also FAZ-mismatches.xml
-
-	Refused:
-		- dynamic.faz.net
-		- m.faz.net
+	Invalid certificate:
+		- faz-community.faz.net
 		- quelleinternet.faz.net
-		- tv.faz.net
-
-	Redirect:
-		- www.faz.net
-		- charts.faz.net
-		- event.faz.net
-		- fazarchiv.faz.net
-		- hochschulanzeiger.faz.net
-		- kfz-versicherung.faz.net
-		- software-portal.faz.net
-		- ts.faz.net
-		- verlag.faz.net
-
-	404 not found:
-		- www.fazschule.net
-
-	Mismatch, but redirect:
-		- www.fazjob.net
-		- m.fazjob.net
-		- rebrush-oas.fazjob.net
+		- berufundchance.fazjob.net
 
-	Mismatch:
-		- ^faz.net
-		- boersenlexikon.faz.net
-		- boersenspiel.faz.net
-		- faz-community.faz.net
-		- fazschule.net
-		- jobsuche-hochschulanzeiger.fazjob.net
+	Timeout:
+		- literaturkalender.faz.net
 		- kulturkalender.faz.net
-		- lebenswege.faz.net
-		- media[01]
-		- tarife.faz.net
-		- wetter.faz.net
 		- ^fazjob.net
 		- agbs.fazjob.net
-		- berufundchance.fazjob.net
 		- news.fazschule.net
-		- (www.)faz.de
+-->
+<ruleset name="FAZ (partial)">
 
-	Self-signed:
-		- 50plus.faz.net
-		- literaturkalender.faz.net
+	<target host="faz.net" />
+	<target host="www.faz.net" />
+	<target host="50plus.faz.net" />
+	<target host="abo.faz.net" />
+	<target host="blogs.faz.net" />
+	<target host="boersenlexikon.faz.net" />
+	<target host="boersenspiel.faz.net" />
+	<target host="dynamic.faz.net" />
+		<test url="http://dynamic.faz.net/red/2016/pendler/Pendler.pdf" />
+	<target host="event.faz.net" />
+	<target host="fazarchiv.faz.net" />
+	<target host="gets.faz.net" />
+	<target host="hochschulanzeiger.faz.net" />
+	<target host="immobilien.faz.net" />
+	<target host="immobilienmarkt.faz.net" />
+	<target host="kfz-versicherung.faz.net" />
+	<target host="lebenswege.faz.net" />
+	<target host="m.faz.net" />
+	<target host="media0.faz.net" />
+	<target host="media1.faz.net" />
+	<target host="media2.faz.net" />
+	<target host="media3.faz.net" />
+	<target host="media4.faz.net" />
+	<target host="media5.faz.net" />
+	<target host="media6.faz.net" />
+	<target host="media7.faz.net" />
+	<target host="media8.faz.net" />
+	<target host="media9.faz.net" />
+	<target host="rhein-main-veranstaltungen.faz.net" />
+	<target host="software-portal.faz.net" />
+	<target host="tarife.faz.net" />
+	<target host="ts.faz.net" />
+	<target host="tv.faz.net" />
+	<target host="verlag.faz.net" />
+	<target host="wetter.faz.net" />
 
-	Timeout:
-		- financeforum.fazjob.net
-		- immobilien.faz.net
+	<target host="faz.de" />
+	<target host="www.faz.de" />
 
-	Timeout at HTTP Port 80:
-		- filebox.faz.de
--->
-<ruleset name="FAZ (partial)" platform="mixedcontent">
-	<target host="abo.faz.net"/>
-	<target host="blogs.faz.net"/>
-	<target host="gets.faz.net"/>
-	<target host="www.fazjob.net"/>
-	<target host="m.fazjob.net"/>
-	<target host="rebrush-oas.fazjob.net"/>
-	<target host="jobsuche-hochschulanzeiger.fazjob.net"/>
+	<target host="www.fazjob.net" />
+	<target host="m.fazjob.net" />
+	<target host="rebrush-oas.fazjob.net" />
+	<target host="jobsuche-hochschulanzeiger.fazjob.net" />
 
-	<securecookie host="^(?:www\.)?fazjob\.net$" name=".+" />
+	<target host="fazschule.net" />
+	<target host="www.fazschule.net" />
 
-	<rule from="^http://www\.fazjob\.net/"
-		to="https://stellenmarkt.faz.net/" />
-
-	<rule from="^http://m\.fazjob\.net/"
-		to="https://stellenmarkt.faz.net/" />
+	<securecookie host=".+" name=".+" />
 
 	<rule from="^http://rebrush-oas\.fazjob\.net/"
 		to="https://stellenmarkt.faz.net/" />
 
 	<rule from="^http://jobsuche-hochschulanzeiger\.fazjob\.net/"
 		to="https://stellenmarkt.faz.net/" />
 
-	<rule from="^http:"
-		to="https:"/>
+	<!-- Invalid certificate on https://(www.)?faz.de/,
+		http://(www.)?faz.de/ redirects to https://www.faz.net/. -->
+	<rule from="^http://(www\.)?faz\.de/"
+			to="https://www.faz.net/" />
+
+	<rule from="^http:"	to="https:" />
+
 </ruleset>