From 2d5e182ae5054c635f6a0febcb0dd4cee42fc1ce Mon Sep 17 00:00:00 2001
From: donced <donced@users.noreply.github.com>
Date: Sun, 30 Aug 2015 11:13:55 +0930
Subject: [PATCH 1/5] Update Custhelp.com.xml

---
 src/chrome/content/rules/Custhelp.com.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/chrome/content/rules/Custhelp.com.xml b/src/chrome/content/rules/Custhelp.com.xml
index a2244fd4deb1..0885efc65812 100644
--- a/src/chrome/content/rules/Custhelp.com.xml
+++ b/src/chrome/content/rules/Custhelp.com.xml
@@ -21,7 +21,6 @@
 		<test url="http://ora-fusion-apps.custhelp.com/" />
 		<test url="http://www.custhelp.com/" />
 
-
 	<!--	Not secured by server:
 					-->
 	<!--securecookie host="^appsconnect\.custhelp\.com$" name="^HiveSession$" /-->
@@ -35,6 +34,10 @@
 
 	<securecookie host="^.*\.custhelp\.com$" name="^(?!ps_cookie$).*" />
 
+	<!-- MCB issue -->
+	<exclusion pattern="^http://canoncanada\.custhelp\.com/" />
+
+		<test url="http://canoncanada.custhelp.com/" />
 
 	<!--	Redirect drops path amd forward
 		slash, but not args:
@@ -45,9 +48,7 @@
 		<test url="http://custhelp.com/foo" />
 		<test url="http://www.custhelp.com/foo" />
 
-	<!--	Unique subdomain for each client.
-							-->
-	<rule from="^http://([\w\-]+)\.custhelp\.com/"
-		to="https://$1.custhelp.com/" />
+	<rule from="^http:"
+		to="https:" />
 
 </ruleset>

From 41a6510f11021a343378f0f9cec98c640311e7b7 Mon Sep 17 00:00:00 2001
From: donced <donced@users.noreply.github.com>
Date: Sun, 30 Aug 2015 11:15:50 +0930
Subject: [PATCH 2/5] Update bplaced.xml

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

diff --git a/src/chrome/content/rules/bplaced.xml b/src/chrome/content/rules/bplaced.xml
index fe20c3223e2a..3bc641ef7632 100644
--- a/src/chrome/content/rules/bplaced.xml
+++ b/src/chrome/content/rules/bplaced.xml
@@ -10,7 +10,12 @@
 	<target host=    "bplaced.net" />
 	<target host="www.bplaced.net" />
 
-  	<securecookie host="^www\.bplaced\.net$" name=".+" />
+	<securecookie host="^www\.bplaced\.net$" name=".*" />
+	
+	<rule from="^http://bplaced\.net/"
+		to="https://www.bplaced.net/" />
+
+		<test url="http://www.bplaced.net/" />
 
 	<rule from="^http:"
 		to="https:" />

From b9939d16b0a6a546b92389c01616ef21a047e71e Mon Sep 17 00:00:00 2001
From: donced <donced@users.noreply.github.com>
Date: Sun, 30 Aug 2015 11:16:12 +0930
Subject: [PATCH 3/5] Update bplaced.xml

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

diff --git a/src/chrome/content/rules/bplaced.xml b/src/chrome/content/rules/bplaced.xml
index 3bc641ef7632..f2834663c5ba 100644
--- a/src/chrome/content/rules/bplaced.xml
+++ b/src/chrome/content/rules/bplaced.xml
@@ -11,7 +11,7 @@
 	<target host="www.bplaced.net" />
 
 	<securecookie host="^www\.bplaced\.net$" name=".*" />
-	
+
 	<rule from="^http://bplaced\.net/"
 		to="https://www.bplaced.net/" />
 

From be0fe1ff52a397693e7bedcad78329b360017b4e Mon Sep 17 00:00:00 2001
From: donced <donced@users.noreply.github.com>
Date: Sun, 30 Aug 2015 11:20:33 +0930
Subject: [PATCH 4/5] Update bplaced.xml

---
 src/chrome/content/rules/bplaced.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/chrome/content/rules/bplaced.xml b/src/chrome/content/rules/bplaced.xml
index f2834663c5ba..fe20c3223e2a 100644
--- a/src/chrome/content/rules/bplaced.xml
+++ b/src/chrome/content/rules/bplaced.xml
@@ -10,12 +10,7 @@
 	<target host=    "bplaced.net" />
 	<target host="www.bplaced.net" />
 
-	<securecookie host="^www\.bplaced\.net$" name=".*" />
-
-	<rule from="^http://bplaced\.net/"
-		to="https://www.bplaced.net/" />
-
-		<test url="http://www.bplaced.net/" />
+  	<securecookie host="^www\.bplaced\.net$" name=".+" />
 
 	<rule from="^http:"
 		to="https:" />

From 2a0a0da93da8f442a1c14c16953fc60172321d15 Mon Sep 17 00:00:00 2001
From: donced <donced@users.noreply.github.com>
Date: Sun, 30 Aug 2015 11:21:20 +0930
Subject: [PATCH 5/5] Update bplaced.xml

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

diff --git a/src/chrome/content/rules/bplaced.xml b/src/chrome/content/rules/bplaced.xml
index fe20c3223e2a..1540c8d8b611 100644
--- a/src/chrome/content/rules/bplaced.xml
+++ b/src/chrome/content/rules/bplaced.xml
@@ -10,7 +10,12 @@
 	<target host=    "bplaced.net" />
 	<target host="www.bplaced.net" />
 
-  	<securecookie host="^www\.bplaced\.net$" name=".+" />
+  	<securecookie host="^www\.bplaced\.net$" name=".*" />
+
+	<rule from="^http://bplaced\.net/"
+		to="https://www.bplaced.net/" />
+
+		<test url="http://www.bplaced.net/" />
 
 	<rule from="^http:"
 		to="https:" />