From 18a7c83f3f6990219ebbbc38ef7264b9c1ca10a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= <s@fuglede.dk>
Date: Sun, 8 Mar 2015 12:08:12 +0100
Subject: [PATCH 1/3] Exclusion pattern for video streaming

---
 src/chrome/content/rules/Politiken.dk.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/chrome/content/rules/Politiken.dk.xml b/src/chrome/content/rules/Politiken.dk.xml
index 435d37c4ddde..30077afafaf2 100644
--- a/src/chrome/content/rules/Politiken.dk.xml
+++ b/src/chrome/content/rules/Politiken.dk.xml
@@ -47,6 +47,9 @@
 	<target host="*.politiken.dk" />
 		<exclusion pattern="^http://(?:plus|shop)\.politiken\.dk/(?!Css/|[iI]mages/|Uploaded/|favicon\.ico)" />
 
+		<!-- Video streaming requires external resources that
+		     fail as mixed content in some browsers. -->
+		<exclusion pattern="^http://(www\.)?politiken.dk/tv/" />
 
 	<rule from="^http://multimedia\.pol\.dk/"
 		to="https://multimedia.pol.dk/" />

From 27596a2e0ab72b16230f04ea3c2e61f1163f6671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= <s@fuglede.dk>
Date: Mon, 23 Mar 2015 20:11:37 +0100
Subject: [PATCH 2/3] Added a few tests

---
 src/chrome/content/rules/Politiken.dk.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/chrome/content/rules/Politiken.dk.xml b/src/chrome/content/rules/Politiken.dk.xml
index 30077afafaf2..46282e95226c 100644
--- a/src/chrome/content/rules/Politiken.dk.xml
+++ b/src/chrome/content/rules/Politiken.dk.xml
@@ -44,22 +44,27 @@
 
 	<target host="multimedia.pol.dk" />
 	<target host="politiken.dk" />
-	<target host="*.politiken.dk" />
+	<target host="www.politiken.dk" />
+	<target host="plus.politiken.dk" />
+	<target host="shop.politiken.dk" />
+	<target host="web.politiken.dk" />
 		<exclusion pattern="^http://(?:plus|shop)\.politiken\.dk/(?!Css/|[iI]mages/|Uploaded/|favicon\.ico)" />
 
-		<!-- Video streaming requires external resources that
-		     fail as mixed content in some browsers. -->
+	<!--	Video streaming requires external resources that
+		fail as mixed content in some browsers. -->
 		<exclusion pattern="^http://(www\.)?politiken.dk/tv/" />
+		<test url="http://politiken.dk/tv/" />
+		<test url="http://www.politiken.dk/tv/" />
 
 	<rule from="^http://multimedia\.pol\.dk/"
 		to="https://multimedia.pol.dk/" />
 
-	<rule from="^http://((?:plus|shop|www)\.)?politiken\.dk/"
-		to="https://$1politiken.dk/" />
-
 	<!--	Redirect drops args:
 					-->
 	<rule from="^http://web\.politiken\.dk/+(?:$|\?.*)"
 		to="https://politiken.dk/VisArtikel.iasp?PageID=1" />
 
+	<rule from="^http://"
+		to="https://" />
+
 </ruleset>

From 11c76f22207c797c5e21aa848809bfcb51145d9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= <s@fuglede.dk>
Date: Wed, 1 Apr 2015 19:31:10 +0200
Subject: [PATCH 3/3] Added a few tests. Removed web.politiken.dk rule which
 appears to do nothing

---
 src/chrome/content/rules/Politiken.dk.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/chrome/content/rules/Politiken.dk.xml b/src/chrome/content/rules/Politiken.dk.xml
index 46282e95226c..38b3d7342efb 100644
--- a/src/chrome/content/rules/Politiken.dk.xml
+++ b/src/chrome/content/rules/Politiken.dk.xml
@@ -24,10 +24,8 @@
 
 		- plus *
 		- shop *
-		- web ²		(→ ^)
 
 	* Some pages redirect to http
-	² [^/?]+ doesn't redirect
 
 
 	Mixed content:
@@ -47,8 +45,10 @@
 	<target host="www.politiken.dk" />
 	<target host="plus.politiken.dk" />
 	<target host="shop.politiken.dk" />
-	<target host="web.politiken.dk" />
+
 		<exclusion pattern="^http://(?:plus|shop)\.politiken\.dk/(?!Css/|[iI]mages/|Uploaded/|favicon\.ico)" />
+		<test url="http://plus.politiken.dk/" />
+		<test url="http://shop.politiken.dk/" />
 
 	<!--	Video streaming requires external resources that
 		fail as mixed content in some browsers. -->
@@ -59,12 +59,7 @@
 	<rule from="^http://multimedia\.pol\.dk/"
 		to="https://multimedia.pol.dk/" />
 
-	<!--	Redirect drops args:
-					-->
-	<rule from="^http://web\.politiken\.dk/+(?:$|\?.*)"
-		to="https://politiken.dk/VisArtikel.iasp?PageID=1" />
-
-	<rule from="^http://"
-		to="https://" />
+	<rule from="^http:"
+		to="https:" />
 
 </ruleset>