From 1dcafda28ed92a8bd7e0a1d6d7f3489a9a4a8617 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing <ccspasu@gmail.com>
Date: Wed, 8 Aug 2018 13:39:20 +0800
Subject: [PATCH] Remove problematic protocol rewrite from YouVersion.xml
 (#15982)

---
 src/chrome/content/rules/Bible.com.xml        | 18 ++++++++++++
 .../content/rules/BibleSociety.co.za.xml      |  6 ++++
 src/chrome/content/rules/YouVersion.com.xml   | 29 +++++++++++++++++++
 src/chrome/content/rules/YouVersion.xml       | 29 -------------------
 4 files changed, 53 insertions(+), 29 deletions(-)
 create mode 100644 src/chrome/content/rules/Bible.com.xml
 create mode 100644 src/chrome/content/rules/BibleSociety.co.za.xml
 create mode 100644 src/chrome/content/rules/YouVersion.com.xml
 delete mode 100644 src/chrome/content/rules/YouVersion.xml

diff --git a/src/chrome/content/rules/Bible.com.xml b/src/chrome/content/rules/Bible.com.xml
new file mode 100644
index 000000000000..e1dd6575262d
--- /dev/null
+++ b/src/chrome/content/rules/Bible.com.xml
@@ -0,0 +1,18 @@
+<!--
+	Non-functional hosts
+		Timeout was reached:
+		- share.bible.com
+
+		SSL peer certificate was not OK:
+		- free.bible.com
+-->
+<ruleset name="Bible.com">
+	<target host="bible.com" />
+	<target host="www.bible.com" />
+	<target host="app.bible.com" />
+	<target host="events.bible.com" />
+	<target host="nodejs.bible.com" />
+	<test url="http://nodejs.bible.com/assets/style.main.4e4c1183999a10efd085c69bc1cf27d0.css" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/BibleSociety.co.za.xml b/src/chrome/content/rules/BibleSociety.co.za.xml
new file mode 100644
index 000000000000..25276761b305
--- /dev/null
+++ b/src/chrome/content/rules/BibleSociety.co.za.xml
@@ -0,0 +1,6 @@
+<ruleset name="BibleSociety.co.za" platform="mixedcontent">
+	<target host="biblesociety.co.za" />
+	<target host="www.biblesociety.co.za" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/YouVersion.com.xml b/src/chrome/content/rules/YouVersion.com.xml
new file mode 100644
index 000000000000..8ef0fbe12f54
--- /dev/null
+++ b/src/chrome/content/rules/YouVersion.com.xml
@@ -0,0 +1,29 @@
+<!--
+	Non-functional hosts
+		Timeout was reached:
+		- bibleseries.youversion.com
+		- web-assets.youversion.com
+
+		SSL connect error:
+		- essential100.youversion.com
+		- featuredplans.youversion.com
+		- focusonthefamily.youversion.com
+		- oneyearbible.youversion.com
+		- relentless.youversion.com
+		- sharethebible.youversion.com
+		- thistlebend.youversion.com
+
+		SSL peer certificate was not OK:
+		- webcast.youversion.com
+
+		Mixed content blocking (MCB) triggered:
+		- blog.youversion.com
+-->
+<ruleset name="YouVersion.com">
+	<target host="youversion.com" />
+	<target host="www.youversion.com" />
+	<target host="analytics.youversion.com" />
+	<target host="help.youversion.com" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/YouVersion.xml b/src/chrome/content/rules/YouVersion.xml
deleted file mode 100644
index 3b0d4ce834cc..000000000000
--- a/src/chrome/content/rules/YouVersion.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-	Problematic domains:
-
-		- bible.com *
-		- youversion.com *
-
-	* Times out
-
--->
-<ruleset name="YouVersion">
-
-	<target host="bible.com" />
-	<target host="*.bible.com" />
-	<target host="*.biblesociety.co.za" />
-	<target host="youversion.com" />
-	<target host="*.youversion.com" />
-
-
-	<securecookie host="^(?:www)?\.(?:bible|youversion)\.com$" name=".+" />
-	<securecookie host="^\.biblesociety\.co\.za$" name="^_youversion-web_session$" />
-
-
-	<rule from="^http?://(?:www\.)?(bible|yourversion)\.com/"
-		to="https://www.$1.com/" />
-
-	<rule from="^http://bibles\.biblesociety\.co\.za/"
-		to="https://bibles.biblesociety.co.za/" />
-
-</ruleset>
\ No newline at end of file