From 54d6948cd3322787d1b569ff32ff1165d9d5fe8e Mon Sep 17 00:00:00 2001
From: jowi <sjw@gmx.ch>
Date: Fri, 1 Jan 2016 16:10:54 +0100
Subject: [PATCH 1/7] added Bernina.xml

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

diff --git a/src/chrome/content/rules/Bernina.xml b/src/chrome/content/rules/Bernina.xml
new file mode 100644
index 000000000000..dd2a11445320
--- /dev/null
+++ b/src/chrome/content/rules/Bernina.xml
@@ -0,0 +1,56 @@
+<!--
+	refused:
+		- bsr
+		- www.youngfashion
+
+	redirect:
+		- shop
+
+	mismatch:
+		- challenge
+		- content
+
+	self-signed, expired:
+		- blog
+
+	regional domains timeout on https://^bernina-[region].ch
+-->
+<ruleset name="Bernina">
+	<target host="bernina.com"/>
+	<target host="www.bernina.com"/>
+	<target host="adfs.bernina.com"/>
+	<target host="registration.bernina.com"/>
+
+	<target host="bernina-chur.ch"/>
+	<target host="www.bernina-chur.ch"/>
+	<target host="bernina-lausanne.ch"/>
+	<target host="www.bernina-lausanne.ch"/>
+	<target host="bernina-lugano.ch"/>
+	<target host="www.bernina-lugano.ch"/>
+	<target host="bernina-mels.ch"/>
+	<target host="www.bernina-mels.ch"/>
+	<target host="bernina-solothurn.ch"/>
+	<target host="www.bernina-solothurn.ch"/>
+	<target host="bernina-wil.ch"/>
+	<target host="www.bernina-wil.ch"/>
+	<target host="bernina-zürich.ch"/>
+	<target host="www.bernina-zürich.ch"/>
+
+	<rule from="^http://bernina-chur\.ch/"
+		to="https://www.bernina-chur.ch/"/>
+	<rule from="^http://bernina-lausanne\.ch/"
+		to="https://www.bernina-lausanne.ch/"/>
+	<rule from="^http://bernina-lugano\.ch/"
+		to="https://www.bernina-lugano.ch/"/>
+	<rule from="^http://bernina-mels\.ch/"
+		to="https://www.bernina-mels.ch/"/>
+	<rule from="^http://bernina-solothurn\.ch/"
+		to="https://www.bernina-solothurn.ch/"/>
+	<rule from="^http://bernina-wil\.ch/"
+		to="https://www.bernina-wil.ch/"/>
+	<rule from="^http://bernina-zürich\.ch/"
+		to="https://www.bernina-zürich.ch/"/>
+
+	<rule from="^http:"
+		to="https:"/>
+</ruleset>

From da31336ea13bf3ffa65f8c01ef02e9284c931b06 Mon Sep 17 00:00:00 2001
From: jowi <sjw@gmx.ch>
Date: Fri, 29 Jul 2016 01:39:29 +0200
Subject: [PATCH 2/7] use punycode

---
 src/chrome/content/rules/Bernina.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/rules/Bernina.xml b/src/chrome/content/rules/Bernina.xml
index dd2a11445320..0ec28588008c 100644
--- a/src/chrome/content/rules/Bernina.xml
+++ b/src/chrome/content/rules/Bernina.xml
@@ -33,8 +33,10 @@
 	<target host="www.bernina-solothurn.ch"/>
 	<target host="bernina-wil.ch"/>
 	<target host="www.bernina-wil.ch"/>
-	<target host="bernina-zürich.ch"/>
-	<target host="www.bernina-zürich.ch"/>
+
+	<!-- punycode to solve unicode problems in tests -->
+	<target host="xn--bernina-zrich-4ob.ch"/>
+	<target host="www.xn--bernina-zrich-4ob.ch"/>
 
 	<rule from="^http://bernina-chur\.ch/"
 		to="https://www.bernina-chur.ch/"/>
@@ -48,8 +50,8 @@
 		to="https://www.bernina-solothurn.ch/"/>
 	<rule from="^http://bernina-wil\.ch/"
 		to="https://www.bernina-wil.ch/"/>
-	<rule from="^http://bernina-zürich\.ch/"
-		to="https://www.bernina-zürich.ch/"/>
+	<rule from="^http://xn--bernina-zrich-4ob.ch/"
+		to="https://www.xn--bernina-zrich-4ob.ch/"/>
 
 	<rule from="^http:"
 		to="https:"/>

From b368365891b393631be18da193287a34999abd39 Mon Sep 17 00:00:00 2001
From: jowi <sjw@gmx.ch>
Date: Sun, 18 Jun 2017 15:21:44 +0200
Subject: [PATCH 3/7] update ruleset

---
 src/chrome/content/rules/Bernina.xml | 52 ++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/chrome/content/rules/Bernina.xml b/src/chrome/content/rules/Bernina.xml
index 0ec28588008c..a09fe1517f9f 100644
--- a/src/chrome/content/rules/Bernina.xml
+++ b/src/chrome/content/rules/Bernina.xml
@@ -1,25 +1,54 @@
 <!--
-	refused:
-		- bsr
-		- www.youngfashion
-
-	redirect:
-		- shop
+	Secure connection failed:
+		- registrierung.bernina.com
+		- sk.bernina.com
+		- www.youngfashion.bernina.com
 
 	mismatch:
-		- challenge
-		- content
+		- 3series.bernina.com
+		- 5series.bernina.com
+		- bsr.bernina.com
+		- ca.bernina.com
+		- ch.bernina.com
+		- challenge.bernina.com
+		- de.bernina.com
+		- dk.bernina.com
+		- es.bernina.com
+		- factory.bernina.com
+		- fr.bernina.com
+		- in.bernina.com
+		- nz.bernina.com
+		- shop.bernina.com
+		- survey.bernina.com
+		- us.bernina.com
+
+		- bernina-chur.ch
+		- bernina-lausanne.ch
+		- bernina-lugano.ch
+		- bernina-mels.ch
+		- bernina-solothurn.ch
+		- bernina-wil.ch
+		- bernina-zürich.ch
 
-	self-signed, expired:
-		- blog
+	self-signed:
+		- (www\.)?bernina-zuerich.ch
 
-	regional domains timeout on https://^bernina-[region].ch
+	No working URL known:
+		- secure.bernina.com (403)
 -->
 <ruleset name="Bernina">
 	<target host="bernina.com"/>
 	<target host="www.bernina.com"/>
 	<target host="adfs.bernina.com"/>
+		<test url="http://adfs.bernina.com/adfs/portal/logo/logo.png"/>
+	<target host="blog.bernina.com"/>
+	<target host="checkout.bernina.com"/>
+	<target host="newsletter.bernina.com"/>
 	<target host="registration.bernina.com"/>
+	<target host="service.bernina.com"/>
+	<target host="sm.bernina.com"/>
+	<target host="weallsew.bernina.com"/>
+	<target host="webmail.bernina.com"/>
 
 	<target host="bernina-chur.ch"/>
 	<target host="www.bernina-chur.ch"/>
@@ -38,6 +67,7 @@
 	<target host="xn--bernina-zrich-4ob.ch"/>
 	<target host="www.xn--bernina-zrich-4ob.ch"/>
 
+	<!-- cert only matches www -->
 	<rule from="^http://bernina-chur\.ch/"
 		to="https://www.bernina-chur.ch/"/>
 	<rule from="^http://bernina-lausanne\.ch/"

From ee9d4008e841a13f7a32a420f6cfc4b74032fdcf Mon Sep 17 00:00:00 2001
From: jowi <sjw@gmx.ch>
Date: Sun, 18 Jun 2017 16:54:30 +0200
Subject: [PATCH 4/7] fix unescaped dot

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

diff --git a/src/chrome/content/rules/Bernina.xml b/src/chrome/content/rules/Bernina.xml
index a09fe1517f9f..389fda29e4cb 100644
--- a/src/chrome/content/rules/Bernina.xml
+++ b/src/chrome/content/rules/Bernina.xml
@@ -80,7 +80,7 @@
 		to="https://www.bernina-solothurn.ch/"/>
 	<rule from="^http://bernina-wil\.ch/"
 		to="https://www.bernina-wil.ch/"/>
-	<rule from="^http://xn--bernina-zrich-4ob.ch/"
+	<rule from="^http://xn--bernina-zrich-4ob\.ch/"
 		to="https://www.xn--bernina-zrich-4ob.ch/"/>
 
 	<rule from="^http:"

From 9c4115fe2f1955d0883b297a190fc2f81148c2f0 Mon Sep 17 00:00:00 2001
From: jowi <sjw@gmx.ch>
Date: Sun, 18 Jun 2017 18:06:20 +0200
Subject: [PATCH 5/7] tests fixed

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

diff --git a/src/chrome/content/rules/Bernina.xml b/src/chrome/content/rules/Bernina.xml
index 389fda29e4cb..4e8065c2dc82 100644
--- a/src/chrome/content/rules/Bernina.xml
+++ b/src/chrome/content/rules/Bernina.xml
@@ -50,6 +50,12 @@
 	<target host="weallsew.bernina.com"/>
 	<target host="webmail.bernina.com"/>
 
+	<!-- too many redirects for fetch tests -->
+	<exclusion pattern="^http://bernina\.com/$"/>
+	<exclusion pattern="^http://www\.bernina\.com/$"/>
+	<test url="http://bernina.com/Bernina/img/r-logo-bernina.svg"/>
+	<test url="http://www.bernina.com/Bernina/img/r-logo-bernina.svg"/>
+
 	<target host="bernina-chur.ch"/>
 	<target host="www.bernina-chur.ch"/>
 	<target host="bernina-lausanne.ch"/>

From b7be7931de673d9e2a60baa7b37aa5563e0ab2b8 Mon Sep 17 00:00:00 2001
From: jowi <sjw@gmx.ch>
Date: Sun, 18 Jun 2017 22:38:01 +0200
Subject: [PATCH 6/7] rm target adfs.bernina.com

---
 src/chrome/content/rules/Bernina.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/rules/Bernina.xml b/src/chrome/content/rules/Bernina.xml
index 4e8065c2dc82..647eda2b8e6b 100644
--- a/src/chrome/content/rules/Bernina.xml
+++ b/src/chrome/content/rules/Bernina.xml
@@ -35,12 +35,13 @@
 
 	No working URL known:
 		- secure.bernina.com (403)
+
+	Different content:
+		- adfs.bernina.com
 -->
 <ruleset name="Bernina">
 	<target host="bernina.com"/>
 	<target host="www.bernina.com"/>
-	<target host="adfs.bernina.com"/>
-		<test url="http://adfs.bernina.com/adfs/portal/logo/logo.png"/>
 	<target host="blog.bernina.com"/>
 	<target host="checkout.bernina.com"/>
 	<target host="newsletter.bernina.com"/>

From dd5058804b2ed057935bef3dbab7425d453d4f18 Mon Sep 17 00:00:00 2001
From: jowi <sjw@gmx.ch>
Date: Sun, 18 Jun 2017 23:35:28 +0200
Subject: [PATCH 7/7] redirect bernina-zuerich

---
 src/chrome/content/rules/Bernina.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Bernina.xml b/src/chrome/content/rules/Bernina.xml
index 647eda2b8e6b..5c62070853f3 100644
--- a/src/chrome/content/rules/Bernina.xml
+++ b/src/chrome/content/rules/Bernina.xml
@@ -37,7 +37,7 @@
 		- secure.bernina.com (403)
 
 	Different content:
-		- adfs.bernina.com
+		- adfs.bernina.com (https://adfs.bernina.com/adfs/portal/logo/logo.png)
 -->
 <ruleset name="Bernina">
 	<target host="bernina.com"/>
@@ -69,6 +69,8 @@
 	<target host="www.bernina-solothurn.ch"/>
 	<target host="bernina-wil.ch"/>
 	<target host="www.bernina-wil.ch"/>
+	<target host="bernina-zuerich.ch"/>
+	<target host="www.bernina-zuerich.ch"/>
 
 	<!-- punycode to solve unicode problems in tests -->
 	<target host="xn--bernina-zrich-4ob.ch"/>
@@ -90,6 +92,11 @@
 	<rule from="^http://xn--bernina-zrich-4ob\.ch/"
 		to="https://www.xn--bernina-zrich-4ob.ch/"/>
 
+	<!-- cert only matches www.bernina-zürich.ch
+	page shows broken frame, so we just redirect it -->
+	<rule from="^http://(www\.)?bernina-zuerich\.ch/"
+		to="https://www.xn--bernina-zrich-4ob.ch/"/>
+
 	<rule from="^http:"
 		to="https:"/>
 </ruleset>