From cc9b16c4eb8a54fe616eb616adcd1ef82487eaa7 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Thu, 4 May 2017 17:48:14 +0200
Subject: [PATCH] Update srg-ssr.xml (#8551)

---
 src/chrome/content/rules/srg-ssr.xml | 101 ++++++++++++++-------------
 utils/downgrade-whitelist.txt        |  11 ---
 2 files changed, 52 insertions(+), 60 deletions(-)

diff --git a/src/chrome/content/rules/srg-ssr.xml b/src/chrome/content/rules/srg-ssr.xml
index 55fb6711ff62..752d230f951e 100644
--- a/src/chrome/content/rules/srg-ssr.xml
+++ b/src/chrome/content/rules/srg-ssr.xml
@@ -1,96 +1,99 @@
 <!--
 	Mismatch:
-		- *rtsr.ch
-		- *rtr.ch
 		- 19h30.rts.ch
 		- 20juin.rts.ch
 		- agendac3.rts.ch
 		- blog.rts.ch
 		- blogs.rts.ch
-		- info.rts.ch
-		- gb.srgssr.ch	
+		- gb.srgssr.ch
 		- rg.srgssr.ch
 		- cicr.rsi.ch
-		- mediaww.rsi.ch
+		- live.rsi.ch
 		- ikrk.srf.ch
-		- m.srf.ch
-		- ws.srf.ch
-		- podcasts.srf.ch
+		- icrc.srf.ch
+		- esc.srf.ch
 		- tvprogramm.srf.ch
-		- www.srf.ch
 		- srgplayer-rts.stage.srf.ch
 		- www.srfcdn.ch
 
-	Expired:
-		- rtsentreprise.ch
-
 	Wrong content:
-		- giochi.rsi.ch
-		- shop.rsi.ch
 		- srfvodhd-vh.akamaihd.net
+		- portalemedia.rsi.ch
 
 	Refused:
-		- www[2-9].rsi.ch
 		- dgst.srf.ch
 		- donau.srf.ch
 		- thevoice.srf.ch
 
-	No response:
-		- srf.ch
+	Secure connection failed:
+		- 360langstrasse.srf.ch
+		- seidenstrasse.srf.ch
+
+	Timeout:
+		- media.rtr.ch
+		- songinfo.rtr.ch
 
 	HTTP redirect:
+		- mediaww.rsi.ch
 		- (www\.)?srgssr.ch
-		- (www\.)?swissinfo.ch
 
-	Mixed Content:
-		- (www\.)?rsi.ch
 -->
-<ruleset name="SRG SSR (partial)">
+<ruleset name="SRG SSR">
 	<target host="broadcast.ch"/>
 	<target host="www.broadcast.ch"/>
+
 	<target host="swissinfo.ch"/>
 	<target host="www.swissinfo.ch"/>
+
+	<target host="rtsr.ch"/>
+	<target host="www.rtsr.ch"/>
+
+	<target host="rtsentreprise.ch"/>
+	<target host="www.rtsentreprise.ch"/>
+
 	<target host="il.srgssr.ch"/>
 	<target host="metro.srgssr.ch"/>
+		<target host="mdm.portal.srgssr.ch"/>
+		<target host="owa.portal.srgssr.ch"/>
+		<target host="siraweb.portal.srgssr.ch"/>
 	<target host="tp.srgssr.ch"/>
 	<target host="transfer.srgssr.ch"/>
-	<target host="mdm.portal.srgssr.ch"/>
-	<target host="owa.portal.srgssr.ch"/>
-	<target host="siraweb.portal.srgssr.ch"/>
+
 	<target host="rts.ch"/>
 	<target host="www.rts.ch"/>
 	<target host="boutique.rts.ch"/>
+	<target host="details.rts.ch"/>
+	<target host="info.rts.ch"/>
 	<target host="kids.rts.ch"/>
 	<target host="m.rts.ch"/>
+	<target host="pages.rts.ch"/>
 	<target host="vap.rts.ch"/>
-	<target host="webseries.rsi.ch"/>
 
-	<exclusion pattern="^http://www.swissinfo.ch/fre"/>
-	<exclusion pattern="^http://www.swissinfo.ch/chi"/>
-	<exclusion pattern="^http://www.swissinfo.ch/rus"/>
-	<exclusion pattern="^http://www.swissinfo.ch/jpn"/>
-	<exclusion pattern="^http://www.swissinfo.ch/ara"/>
-	<exclusion pattern="^http://www.swissinfo.ch/eng"/>
-	<exclusion pattern="^http://www.swissinfo.ch/spa"/>
-	<exclusion pattern="^http://www.swissinfo.ch/ger"/>
-	<exclusion pattern="^http://www.swissinfo.ch/por"/>
-	<exclusion pattern="^http://www.swissinfo.ch/ita"/>
+	<target host="rsi.ch"/>
+	<target host="www.rsi.ch"/>
+	<target host="cdn.rsi.ch"/>
+	<target host="giochi.rsi.ch"/>
+	<target host="shop.rsi.ch"/>
+	<target host="webseries.rsi.ch"/>
 
-	<test url="http://www.swissinfo.ch/fre"/>
-	<test url="http://www.swissinfo.ch/chi"/>
-	<test url="http://www.swissinfo.ch/rus"/>
-	<test url="http://www.swissinfo.ch/jpn"/>
-	<test url="http://www.swissinfo.ch/ara"/>
-	<test url="http://www.swissinfo.ch/eng"/>
-	<test url="http://www.swissinfo.ch/spa"/>
-	<test url="http://www.swissinfo.ch/ger"/>
-	<test url="http://www.swissinfo.ch/por"/>
-	<test url="http://www.swissinfo.ch/ita"/>
-	<test url="https://ws.srf.ch/"/>
+	<target host="rtr.ch"/>
+	<target host="www.rtr.ch"/>
+	<target host="m.rtr.ch"/>
+	<target host="play.rtr.ch"/>
 
-	<!-- server generates protocol wrong URL -->
-	<rule from="^https://ws\.srf\.ch/"
-		to="http://ws.srf.ch/" downgrade="1"/>
+	<target host="srf.ch"/>
+	<target host="www.srf.ch"/>
+	<target host="m.srf.ch"/>
+	<target host="ws.srf.ch"/>
+	<target host="s1.srf.ch"/>
+	<target host="s2.srf.ch"/>
+	<target host="s3.srf.ch"/>
+	<target host="s4.srf.ch"/>
+	<target host="s5.srf.ch"/>
+	<target host="s6.srf.ch"/>
+	<target host="videoarchiv.srf.ch"/>
+	<target host="skitippspiel.srf.ch"/>
+	<target host="podcasts.srf.ch"/>
 
 	<rule from="^http:"
 		to="https:"/>
diff --git a/utils/downgrade-whitelist.txt b/utils/downgrade-whitelist.txt
index 5a569d53b671..e69de29bb2d1 100644
--- a/utils/downgrade-whitelist.txt
+++ b/utils/downgrade-whitelist.txt
@@ -1,11 +0,0 @@
-Adform (partial)
-CERN.ch (partial)
-Contextly.com (partial)
-Craigslist.org (partial)
-dafont.com (partial)
-Fourmilab (partial)
-IBTimes.co.uk
-Lenovo (partial)
-Link+ Catalog
-Marktplaats (buggy)
-SRG SSR (partial)