Re-enable AmazonAWS AmericanExpress GoDaddy

jsha · jsha · commit 2abaaf570c75 · 2015-06-25T20:19:42.000-07:00
diff --git a/src/chrome/content/rules/AmazonAWS.xml b/src/chrome/content/rules/AmazonAWS.xml
@@ -91,7 +91,7 @@
 		- z-ak.images-amazon.com
 
 -->
-<ruleset name="Amazon Web Services" default_off='failed ruleset test'>
+<ruleset name="Amazon Web Services">
 
 	<target host="fls-eu.amazon.co.uk" />
 	<target host="aws.amazon.com" />
diff --git a/src/chrome/content/rules/AmericanExpress.xml b/src/chrome/content/rules/AmericanExpress.xml
@@ -85,7 +85,7 @@
 <!-- Thanks to ForceTLS -->
 <!-- Note that there are lots of subdomains and some are still unprotected,
      but some don't work properly in HTTPS anyway.  This is kind of a mess. -->
-<ruleset name="AmericanExpress.com (partial)" default_off='failed ruleset test'>
+<ruleset name="AmericanExpress.com (partial)">
 
 	<!--	Direct rewrites:
 				-->
diff --git a/src/chrome/content/rules/GoDaddy.xml b/src/chrome/content/rules/GoDaddy.xml
@@ -1,11 +1,6 @@
 
 <!--
 Disabled by https-everywhere-checker because:
-Fetch error: http://idp.m.godaddy.com/user/retrieveloginname.aspx?spkey= => https://idp.m.godaddy.com/user/retrieveloginname.aspx?spkey=: (35, 'Unknown SSL protocol error in connection to idp.m.godaddy.com:443 ')
-Fetch error: http://sg.m.godaddy.com/ => https://sg.m.godaddy.com/: Too many redirects while fetching 'https://sg.m.godaddy.com/'
-Fetch error: http://idp.godaddy.com/ => https://idp.godaddy.com/: (35, 'Unknown SSL protocol error in connection to idp.godaddy.com:443 ')
-Fetch error: http://mcc.godaddy.com/ => https://mcc.godaddy.com/: (35, 'Unknown SSL protocol error in connection to idp.godaddy.com:443 ')
-Fetch error: http://shops.godaddy.com/ => https://shops.godaddy.com/: (28, 'Connection timed out after 10001 milliseconds')
 
 	Other GoDaddy rulesets:
 
@@ -53,7 +48,6 @@ Fetch error: http://shops.godaddy.com/ => https://shops.godaddy.com/: (28, 'Conn
 			- mcc
 			- mya
 			- seal
-			- shops
 			- who
 			- ar
 			- au
@@ -122,7 +116,7 @@ Fetch error: http://shops.godaddy.com/ => https://shops.godaddy.com/: (28, 'Conn
 		- who.godaddy.com
 
 -->
-<ruleset name="GoDaddy.com (partial)" default_off='failed ruleset test'>
+<ruleset name="GoDaddy.com (partial)">
 
 	<!--	Direct rewrites:
 				-->
@@ -139,7 +133,6 @@ Fetch error: http://shops.godaddy.com/ => https://shops.godaddy.com/: (28, 'Conn
 	<target host="mcc.godaddy.com" />
 	<target host="mya.godaddy.com" />
 	<target host="seal.godaddy.com" />
-	<target host="shops.godaddy.com" />
 	<target host="support.godaddy.com" />
 	<!--target host="supportcenter.godaddy.com" /-->
 	<target host="who.godaddy.com" />
