Merge pull request EFForg#519 from semenko/tiny-fixes

semenko · semenko · commit a23b5b08ef69 · 2014-08-30T00:19:15.000-05:00
Tiny ruleset fixes
diff --git a/src/chrome/content/rules/Cell.xml b/src/chrome/content/rules/Cell.xml
@@ -1,4 +1,7 @@
 <!--
+	Default off because of infinite loops:
+	https://github.com/EFForg/https-everywhere/issues/493
+
 	Nonfunctional domains:
 
 		- download	(http reply)
@@ -17,9 +20,8 @@
 			- cdn.realtidbits.com *
 
 	* Secured by us
-
 -->
-<ruleset name="Cell (partial)">
+<ruleset name="Cell (partial)" default_off="all infinite loops">
 
 	<target host="cell.com" />
 	<target host="www.cell.com" />
diff --git a/src/chrome/content/rules/E-boks.dk.xml b/src/chrome/content/rules/E-boks.dk.xml
@@ -2,5 +2,9 @@
   <target host="e-boks.dk" />
   <target host="www.e-boks.dk" />
 
+  <!-- Infinite redirects: https://github.com/EFForg/https-everywhere/issues/474
   <rule from="^http://(www\.)?e-boks\.dk/" to="https://www.e-boks.dk/" />
+  -->
+
+  <rule from="^http://logon\.e-boks\.dk/" to="https://logon.e-boks.dk/" />
 </ruleset>
diff --git a/src/chrome/content/rules/Home_Depot.com.xml b/src/chrome/content/rules/Home_Depot.com.xml
@@ -105,8 +105,10 @@
 
 	<securecookie host="^(?:hdapps|hdconnect|homedepotlink|thdfed)?\.homedepot\.com$" name=".+" />
 
+	<!-- www removed from this rule because of server-side breakage:
+	https://github.com/EFForg/https-everywhere/issues/409 -->
 
-	<rule from="^http://(?:secure2\.|www\.)?homedepot\.com/"
+	<rule from="^http://secure2\.homedepot\.com/"
 		to="https://secure2.homedepot.com/" />
 
 	<rule from="^http://(?:www\.)?community\.homedepot\.com/"
@@ -121,4 +123,4 @@
 	<rule from="^http://ir\.homedepot\.com/(client|WebSideStory)/"
 		to="https://origin-phoenix.corporate-ir.net/$1/" />
 
-</ruleset>
+</ruleset>
