From 3c04ea94798815dcf92bdf6f5f3334d6b10dbec1 Mon Sep 17 00:00:00 2001
From: Pasu <cschanaj@users.noreply.github.com>
Date: Tue, 9 May 2017 05:07:35 +0800
Subject: [PATCH] Re-activate and Rename Open_WebMail.org.xml (#9822)

---
 src/chrome/content/rules/Open-WebMail.xml     | 10 ----------
 src/chrome/content/rules/Open_WebMail.org.xml | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 src/chrome/content/rules/Open-WebMail.xml
 create mode 100644 src/chrome/content/rules/Open_WebMail.org.xml

diff --git a/src/chrome/content/rules/Open-WebMail.xml b/src/chrome/content/rules/Open-WebMail.xml
deleted file mode 100644
index 2572d4d7a85e..000000000000
--- a/src/chrome/content/rules/Open-WebMail.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<ruleset name="Open WebMail" default_off="self-signed">
-
-	<target host="openwebmail.org" />
-	<target host="www.openwebmail.org" />
-
-	<!--	Cert doesn't match !www.	-->
-	<rule from="^http://(?:www\.)?openwebmail\.org/"
-		to="https://openwebmail.org/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Open_WebMail.org.xml b/src/chrome/content/rules/Open_WebMail.org.xml
new file mode 100644
index 000000000000..f2668932fc59
--- /dev/null
+++ b/src/chrome/content/rules/Open_WebMail.org.xml
@@ -0,0 +1,15 @@
+<!--
+	Non-functional hosts
+		Peer certificate cannot be authenticated with given CA certificates:
+			 - ftp.openwebmail.org
+			 - mail.openwebmail.org
+			 - server6.openwebmail.org
+-->
+<ruleset name="Open WebMail.org">
+	<target host="openwebmail.org" />
+	<target host="www.openwebmail.org" />
+
+	<securecookie host="^(www\.)?openwebmail\.org$" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>