From cea48718b4247be320bb7cbf59d2a48598145d4d Mon Sep 17 00:00:00 2001
From: fathorse <neoleo@gmail.com>
Date: Mon, 8 Sep 2014 10:12:37 +0200
Subject: [PATCH 01/10] first commit

---
 src/chrome/content/rules/videos.toypics.net.xml | 5 +++++
 src/chrome/content/rules/webchat.oftc.net.xml   | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 src/chrome/content/rules/videos.toypics.net.xml
 create mode 100644 src/chrome/content/rules/webchat.oftc.net.xml

diff --git a/src/chrome/content/rules/videos.toypics.net.xml b/src/chrome/content/rules/videos.toypics.net.xml
new file mode 100644
index 000000000000..07cf2409c587
--- /dev/null
+++ b/src/chrome/content/rules/videos.toypics.net.xml
@@ -0,0 +1,5 @@
+<ruleset name="Toypics">
+  <target host="videos.toypics.net" />
+
+  <rule from="^http://videos.toypics.net/" to="https://videos.toypics.net/"/>
+</ruleset>
diff --git a/src/chrome/content/rules/webchat.oftc.net.xml b/src/chrome/content/rules/webchat.oftc.net.xml
new file mode 100644
index 000000000000..e05e434f990d
--- /dev/null
+++ b/src/chrome/content/rules/webchat.oftc.net.xml
@@ -0,0 +1,5 @@
+<ruleset name="OFTC Webchat">
+  <target host="webchat.oftc.net" />
+
+  <rule from="^http://webchat.oftc.net/" to="https://webchat.oftc.net/"/>
+</ruleset>

From b57700d9c9fadd3bb47a4cf93e35c63adf09e78b Mon Sep 17 00:00:00 2001
From: fathorse <neoleo@gmail.com>
Date: Mon, 8 Sep 2014 11:12:37 +0200
Subject: [PATCH 02/10] Added marktplaats.nl (buggy)

---
 src/chrome/content/rules/marktplaats.nl.xml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/chrome/content/rules/marktplaats.nl.xml

diff --git a/src/chrome/content/rules/marktplaats.nl.xml b/src/chrome/content/rules/marktplaats.nl.xml
new file mode 100644
index 000000000000..5950397233c9
--- /dev/null
+++ b/src/chrome/content/rules/marktplaats.nl.xml
@@ -0,0 +1,7 @@
+<ruleset name="Marktplaats (buggy)" platform="mixedcontent" default_off="Mixed content block breaks advert editing and certain images">
+  <target host="*.marktplaats.nl" />
+  <target host="*.marktplaats.com" />
+  <target host="*.marktplaats.net" />
+
+  <rule from="^http://([^/:@]*)\.marktplaats\.(nl|com|net)/" to="https://$1.marktplaats.$2/"/>
+</ruleset>

From 5b469a4920a74b0f816f6da8597c3edd48d51696 Mon Sep 17 00:00:00 2001
From: fathorse <neoleo@gmail.com>
Date: Mon, 8 Sep 2014 13:55:18 +0200
Subject: [PATCH 03/10] Added bad-dragon.com ruleset

---
 src/chrome/content/rules/bad-dragon.com.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/chrome/content/rules/bad-dragon.com.xml

diff --git a/src/chrome/content/rules/bad-dragon.com.xml b/src/chrome/content/rules/bad-dragon.com.xml
new file mode 100644
index 000000000000..2337b80c5e65
--- /dev/null
+++ b/src/chrome/content/rules/bad-dragon.com.xml
@@ -0,0 +1,9 @@
+<ruleset name="Bad Dragon">
+  <target host="bad-dragon.com" />
+  <target host="labs.bad-dragon.com" />
+  <target host="forums.bad-dragon.com" />
+
+  <rule from="^http://bad-dragon.com/" to="https://bad-dragon.com/"/>
+  <rule from="^http://labs.bad-dragon.com/" to="https://labs.bad-dragon.com/"/>
+  <rule from="^http://forums.bad-dragon.com/" to="https://forums.bad-dragon.com/"/>
+</ruleset>

From 5ce8a2aa7260c35ec992a6c0d057f044625a04d9 Mon Sep 17 00:00:00 2001
From: fathorse <neoleo@gmail.com>
Date: Thu, 11 Sep 2014 12:52:13 +0200
Subject: [PATCH 04/10] Added Canon (global) ruleset

---
 src/chrome/content/rules/Canon.xml | 77 ++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 src/chrome/content/rules/Canon.xml

diff --git a/src/chrome/content/rules/Canon.xml b/src/chrome/content/rules/Canon.xml
new file mode 100644
index 000000000000..add663ee8847
--- /dev/null
+++ b/src/chrome/content/rules/Canon.xml
@@ -0,0 +1,77 @@
+<ruleset name="Canon">
+
+  <!-- Domains checked on September 11th 2014 -->
+
+  <!-- Global -->
+  <target host="www.canon-europe.com" />
+  <target host="www.usa.canon.com" />
+
+  <!-- Scandinavia -->
+  <target host="www.canon.dk" />
+  <target host="www.canon.no" />
+  <target host="www.canon.se" />
+  <target host="www.canon.fi" />
+
+  <!-- Benelux -->
+  <target host="www.canon.nl" />
+  <target host="www.canon.lu" />
+  <target host="nl.canon.be" />
+  <target host="fr.canon.be" />
+  
+  <!-- Europe -->
+  <target host="www.canon.co.uk" /> 
+  <target host="www.canon.fr" />
+  <target host="www.canon.de" />
+  <target host="de.canon.ch" />
+  <target host="fr.canon.ch" />
+  <target host="www.canon.es" />
+  <target host="www.canon.si" />
+  <target host="www.canon.sk" />
+  <target host="www.canon.ba" />
+  <target host="www.canon.at" />
+  <target host="www.canon.it" />
+  <target host="www.canon.ie" />
+  <target host="www.canon.pt" />
+  <target host="www.canon.lv" />
+  <target host="www.canon.lt" />
+  <target host="www.canon.ee" />
+  <target host="www.canon.com.mk" />
+
+  <!-- Oceania -->
+  <target host="www.canon.com.au" />
+  <target host="www.canon.co.nz" />
+
+  <!-- Asia -->
+  <target host="www.canon.com.cn" />
+  <target host="www.canon.com.tr" />
+  <target host="www.canon.ru" />
+
+  <rule from="^http://(de|fr)\.canon\.ch" to="https://$1.canon.ch"/>
+  <rule from="^http://(nl|fr)\.canon\.be" to="https://$1.canon.be"/>
+  <rule from="^http://www\.canon\.(dk|no|se|fi|nl|lu|fr|de|ru|ba|es|si|sk|at|it|ie|pt|lv|lt|ee)" to="https://www.canon.$1"/>
+  <rule from="^http://www\.canon\.co\.(uk|nz)" to="https://www.canon.co.$1"/>
+  <rule from="^http://www\.canon\.com\.(cn|au|tr|mk)" to="https://www.canon.com.$1"/>
+
+  <!-- Domains without TLS support/with downgrade/Broken certificate: 
+       www.canon.com.sg (Singapore)
+       canon.jp (Japan)
+       canon.com (Global)
+       www.canon.co.th (Thailand)
+       www.canon.co.id (Indonesia)
+       www.canon.co.in (India)
+       www.canon.com.hk (Hong Kong)
+       www.canon.com.my (Malaysia)
+       www.canon.co.kr (South Korea)
+       www.canon.com.vn (Vietnam)
+       www.canon-me.com (Middle East regional site)
+       www.canon.cl (Chile)
+       www.canon.com.mx (Mexico)
+       www.canon.com.pa (Panama)
+       www.cla.canon.com (South America Portal)
+       www.canon.com.mt (Malta)
+       www.canon.bg (Bulgaria)
+       www.canon.am (Armenia)
+       www.canon.ua (Ukraine)
+  -->
+
+</ruleset>

From 3275c7fc32deb2d81e3ee6b8f736126378e24cfd Mon Sep 17 00:00:00 2001
From: fathorse <neoleo@gmail.com>
Date: Thu, 11 Sep 2014 13:23:10 +0200
Subject: [PATCH 05/10] Fixed Canon ruleset, added rule for USA

---
 src/chrome/content/rules/Canon.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/chrome/content/rules/Canon.xml b/src/chrome/content/rules/Canon.xml
index add663ee8847..90fc23aa4fbb 100644
--- a/src/chrome/content/rules/Canon.xml
+++ b/src/chrome/content/rules/Canon.xml
@@ -51,6 +51,7 @@
   <rule from="^http://www\.canon\.(dk|no|se|fi|nl|lu|fr|de|ru|ba|es|si|sk|at|it|ie|pt|lv|lt|ee)" to="https://www.canon.$1"/>
   <rule from="^http://www\.canon\.co\.(uk|nz)" to="https://www.canon.co.$1"/>
   <rule from="^http://www\.canon\.com\.(cn|au|tr|mk)" to="https://www.canon.com.$1"/>
+  <rule from="^http://www\.usa\.canon\.com" to="https://www.usa.canon.com"/>
 
   <!-- Domains without TLS support/with downgrade/Broken certificate: 
        www.canon.com.sg (Singapore)

From ec16ada02b96e72623031606f0874418d4ed6bb4 Mon Sep 17 00:00:00 2001
From: fathorse <neoleo@gmail.com>
Date: Thu, 11 Sep 2014 17:06:08 +0200
Subject: [PATCH 06/10] Fixed unescaped periods in 3 rules

---
 src/chrome/content/rules/bad-dragon.com.xml     | 6 +++---
 src/chrome/content/rules/videos.toypics.net.xml | 4 ++--
 src/chrome/content/rules/webchat.oftc.net.xml   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/chrome/content/rules/bad-dragon.com.xml b/src/chrome/content/rules/bad-dragon.com.xml
index 2337b80c5e65..4b6c2d98c9d9 100644
--- a/src/chrome/content/rules/bad-dragon.com.xml
+++ b/src/chrome/content/rules/bad-dragon.com.xml
@@ -3,7 +3,7 @@
   <target host="labs.bad-dragon.com" />
   <target host="forums.bad-dragon.com" />
 
-  <rule from="^http://bad-dragon.com/" to="https://bad-dragon.com/"/>
-  <rule from="^http://labs.bad-dragon.com/" to="https://labs.bad-dragon.com/"/>
-  <rule from="^http://forums.bad-dragon.com/" to="https://forums.bad-dragon.com/"/>
+  <rule from="^http://bad-dragon\.com/" to="https://bad-dragon.com/"/>
+  <rule from="^http://labs\.bad-dragon\.com/" to="https://labs.bad-dragon.com/"/>
+  <rule from="^http://forums\.bad-dragon\.com/" to="https://forums.bad-dragon.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/videos.toypics.net.xml b/src/chrome/content/rules/videos.toypics.net.xml
index 07cf2409c587..d8376018f67b 100644
--- a/src/chrome/content/rules/videos.toypics.net.xml
+++ b/src/chrome/content/rules/videos.toypics.net.xml
@@ -1,5 +1,5 @@
-<ruleset name="Toypics">
+<ruleset name="Toypics" platform="mixedcontent">
   <target host="videos.toypics.net" />
 
-  <rule from="^http://videos.toypics.net/" to="https://videos.toypics.net/"/>
+  <rule from="^http://videos\.toypics\.net/" to="https://videos.toypics.net/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/webchat.oftc.net.xml b/src/chrome/content/rules/webchat.oftc.net.xml
index e05e434f990d..b249637598e8 100644
--- a/src/chrome/content/rules/webchat.oftc.net.xml
+++ b/src/chrome/content/rules/webchat.oftc.net.xml
@@ -1,5 +1,5 @@
 <ruleset name="OFTC Webchat">
   <target host="webchat.oftc.net" />
 
-  <rule from="^http://webchat.oftc.net/" to="https://webchat.oftc.net/"/>
+  <rule from="^http://webchat\.oftc\.net/" to="https://webchat.oftc.net/"/>
 </ruleset>

From aee17c899a7c1f7f32d4cd9316202079615018e9 Mon Sep 17 00:00:00 2001
From: fathorse <neoleo@gmail.com>
Date: Fri, 12 Sep 2014 10:33:07 +0200
Subject: [PATCH 07/10] Fixed trailing slashes in Canon ruleset

---
 src/chrome/content/rules/Canon.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/chrome/content/rules/Canon.xml b/src/chrome/content/rules/Canon.xml
index 90fc23aa4fbb..29dfdc3bb1a1 100644
--- a/src/chrome/content/rules/Canon.xml
+++ b/src/chrome/content/rules/Canon.xml
@@ -46,12 +46,12 @@
   <target host="www.canon.com.tr" />
   <target host="www.canon.ru" />
 
-  <rule from="^http://(de|fr)\.canon\.ch" to="https://$1.canon.ch"/>
-  <rule from="^http://(nl|fr)\.canon\.be" to="https://$1.canon.be"/>
-  <rule from="^http://www\.canon\.(dk|no|se|fi|nl|lu|fr|de|ru|ba|es|si|sk|at|it|ie|pt|lv|lt|ee)" to="https://www.canon.$1"/>
-  <rule from="^http://www\.canon\.co\.(uk|nz)" to="https://www.canon.co.$1"/>
-  <rule from="^http://www\.canon\.com\.(cn|au|tr|mk)" to="https://www.canon.com.$1"/>
-  <rule from="^http://www\.usa\.canon\.com" to="https://www.usa.canon.com"/>
+  <rule from="^http://(de|fr)\.canon\.ch/" to="https://$1.canon.ch/"/>
+  <rule from="^http://(nl|fr)\.canon\.be/" to="https://$1.canon.be/"/>
+  <rule from="^http://www\.canon\.(dk|no|se|fi|nl|lu|fr|de|ru|ba|es|si|sk|at|it|ie|pt|lv|lt|ee)/" to="https://www.canon.$1/"/>
+  <rule from="^http://www\.canon\.co\.(uk|nz)/" to="https://www.canon.co.$1/"/>
+  <rule from="^http://www\.canon\.com\.(cn|au|tr|mk)/" to="https://www.canon.com.$1/"/>
+  <rule from="^http://www\.usa\.canon\.com/" to="https://www.usa.canon.com/"/>
 
   <!-- Domains without TLS support/with downgrade/Broken certificate: 
        www.canon.com.sg (Singapore)

From 993e2ef5f5cfa45a75daf226bc1cf4dab7bf1cb3 Mon Sep 17 00:00:00 2001
From: fathorse <neoleo@gmail.com>
Date: Fri, 12 Sep 2014 10:53:30 +0200
Subject: [PATCH 08/10] Fixed bad-dragon.com ruleset, should exclude
 ^bad-dragon.com/$, also added contact.bad-dragon.com

---
 src/chrome/content/rules/bad-dragon.com.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/bad-dragon.com.xml b/src/chrome/content/rules/bad-dragon.com.xml
index 4b6c2d98c9d9..7f5f00140450 100644
--- a/src/chrome/content/rules/bad-dragon.com.xml
+++ b/src/chrome/content/rules/bad-dragon.com.xml
@@ -2,8 +2,10 @@
   <target host="bad-dragon.com" />
   <target host="labs.bad-dragon.com" />
   <target host="forums.bad-dragon.com" />
+  <target host="contact.bad-dragon.com" />
 
-  <rule from="^http://bad-dragon\.com/" to="https://bad-dragon.com/"/>
+  <rule from="^http://bad-dragon\.com/(.+)" to="https://bad-dragon.com/$1"/>
   <rule from="^http://labs\.bad-dragon\.com/" to="https://labs.bad-dragon.com/"/>
   <rule from="^http://forums\.bad-dragon\.com/" to="https://forums.bad-dragon.com/"/>
+  <rule from="^http://contact\.bad-dragon\.com/" to="https://contact.bad-dragon.com/"/>
 </ruleset>

From 0b1cabd0a0ef773b67313d3d1cce48f2a63c4268 Mon Sep 17 00:00:00 2001
From: fathorse <neoleo@gmail.com>
Date: Fri, 12 Sep 2014 13:02:33 +0200
Subject: [PATCH 09/10] Added vrijstellingoldtimer.nl ruleset

---
 src/chrome/content/rules/marktplaats.nl.xml          | 3 ++-
 src/chrome/content/rules/vrijstellingoldtimer.nl.xml | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 src/chrome/content/rules/vrijstellingoldtimer.nl.xml

diff --git a/src/chrome/content/rules/marktplaats.nl.xml b/src/chrome/content/rules/marktplaats.nl.xml
index 5950397233c9..cbf1b28d238d 100644
--- a/src/chrome/content/rules/marktplaats.nl.xml
+++ b/src/chrome/content/rules/marktplaats.nl.xml
@@ -3,5 +3,6 @@
   <target host="*.marktplaats.com" />
   <target host="*.marktplaats.net" />
 
-  <rule from="^http://([^/:@]*)\.marktplaats\.(nl|com|net)/" to="https://$1.marktplaats.$2/"/>
+  <!-- ^www.marktplaats.nl/$ redirects to http, .com and .net are never used directly, hence the added (.+) to all -->
+  <rule from="^http://([^/:@]*)\.marktplaats\.(nl|com|net)/(.+)" to="https://$1.marktplaats.$2/$3"/>
 </ruleset>
diff --git a/src/chrome/content/rules/vrijstellingoldtimer.nl.xml b/src/chrome/content/rules/vrijstellingoldtimer.nl.xml
new file mode 100644
index 000000000000..81f7800bd6de
--- /dev/null
+++ b/src/chrome/content/rules/vrijstellingoldtimer.nl.xml
@@ -0,0 +1,7 @@
+<ruleset name="Vrijstelling Oldtimer" platform="mixedcontent">
+  <target host="vrijstellingoldtimer.nl" />
+  <target host="www.vrijstellingoldtimer.nl" />
+
+  <rule from="^http://vrijstellingoldtimer\.nl/" to="https://vrijstellingoldtimer.nl/"/>
+  <rule from="^http://www\.vrijstellingoldtimer\.nl/" to="https://www.vrijstellingoldtimer.nl/"/>
+</ruleset>

From f7455ad3ffa9acf5238a4919d22ccdd701dde8fc Mon Sep 17 00:00:00 2001
From: fathorse <neoleo@gmail.com>
Date: Fri, 12 Sep 2014 13:06:45 +0200
Subject: [PATCH 10/10] Undid marktplaats.nl ruleset change

---
 src/chrome/content/rules/marktplaats.nl.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/chrome/content/rules/marktplaats.nl.xml b/src/chrome/content/rules/marktplaats.nl.xml
index cbf1b28d238d..5950397233c9 100644
--- a/src/chrome/content/rules/marktplaats.nl.xml
+++ b/src/chrome/content/rules/marktplaats.nl.xml
@@ -3,6 +3,5 @@
   <target host="*.marktplaats.com" />
   <target host="*.marktplaats.net" />
 
-  <!-- ^www.marktplaats.nl/$ redirects to http, .com and .net are never used directly, hence the added (.+) to all -->
-  <rule from="^http://([^/:@]*)\.marktplaats\.(nl|com|net)/(.+)" to="https://$1.marktplaats.$2/$3"/>
+  <rule from="^http://([^/:@]*)\.marktplaats\.(nl|com|net)/" to="https://$1.marktplaats.$2/"/>
 </ruleset>