Merge pull request EFForg#2724 from donced/custhelp

semenko · semenko · commit 0a451d601e69 · 2015-09-06T16:51:51.000-05:00
[Custhelp.com] Update ruleset
diff --git 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>
