From b6dba38dc0af5927dcf03ca5a0e7b7eae1a00460 Mon Sep 17 00:00:00 2001
From: Pasu Chan <ccspasu@gmail.com>
Date: Thu, 20 Apr 2017 13:58:39 +0800
Subject: [PATCH] Update Habets.se.xml and Habets.pp.se.xml

---
 src/chrome/content/rules/Habets.pp.se.xml     | 15 ++++++++++
 .../content/rules/Habets.se-mismatches.xml    | 18 -----------
 src/chrome/content/rules/Habets.se.xml        | 30 ++++++++++++-------
 3 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100644 src/chrome/content/rules/Habets.pp.se.xml
 delete mode 100644 src/chrome/content/rules/Habets.se-mismatches.xml

diff --git a/src/chrome/content/rules/Habets.pp.se.xml b/src/chrome/content/rules/Habets.pp.se.xml
new file mode 100644
index 000000000000..bc402ee438d4
--- /dev/null
+++ b/src/chrome/content/rules/Habets.pp.se.xml
@@ -0,0 +1,15 @@
+<!--
+	Non-functional hosts
+		Timeout was reached:
+			 - reptilian.habets.pp.se
+
+		Incomplete certificate chain error:
+			 - habets.pp.se
+			 - www.habets.pp.se
+-->
+<ruleset name="Habets.pp.se">
+	<target host="blog.habets.pp.se" />
+	<target host="cdn.habets.pp.se" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Habets.se-mismatches.xml b/src/chrome/content/rules/Habets.se-mismatches.xml
deleted file mode 100644
index df19d22a1157..000000000000
--- a/src/chrome/content/rules/Habets.se-mismatches.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-	For rules that are on by default, see Habets.se.xml.
-
--->
-<ruleset name="habets.se (mismatches)" default_off="mismatch" platform="cacert">
-
-	<!--	Cert *.trn.se
-				-->
-	<target host="habets.se" />
-	<target host="www.habets.se" />
-	<target host="habets.pp.se" />
-	<target host="www.habets.pp.se" />
-
-
-	<rule from="^http://(?:www\.)?habets(\.pp)?\.se/"
-		to="https://habets$1.se/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Habets.se.xml b/src/chrome/content/rules/Habets.se.xml
index aa8a04e921ec..a72874863a77 100644
--- a/src/chrome/content/rules/Habets.se.xml
+++ b/src/chrome/content/rules/Habets.se.xml
@@ -1,17 +1,27 @@
 <!--
-	For problematic rules, see Habets.se-mismatches.xml.
+	Non-functional hosts
+		Couldn't connect to server:
+			 - lmqpov.habets.se
 
--->
-<ruleset name="habets.se (partial)" platform="cacert">
-
-	<target host="*.habets.se" />
-	<target host="*.habets.pp.se" />
+		Peer certificate cannot be authenticated with given CA certificates:
+			 - www.habets.se
+			 - proxy-us.habets.se
 
+		4xx client error:
+			 - cw.habets.se (require authentication)
+-->
+<ruleset name="Habets.se">
+	<target host="habets.se" />
+	<target host="www.habets.se" />
+	<target host="blog.habets.se" />
+	<target host="blog-dev.habets.se" />
+	<target host="cdn.habets.se" />
 
-	<securecookie host="^blog\.habets(?:\.pp)?\.se$" name=".*" />
-
+	<securecookie host=".+" name=".+" />
 
-	<rule from="^http://(blog|cdn)\.habets(\.pp)?\.se/"
-		to="https://$1.habets$2.se/" />
+	<rule from="^http://www\.habets\.se/"
+			to="https://habets.se/" />
 
+	<rule from="^http:" 
+			to="https:" />
 </ruleset>