From 063c0e789dfe36f993f7afb721aa4687816e325c Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Sat, 17 Feb 2018 08:42:46 +0100
Subject: [PATCH 1/4] [AmazonAWS.com] Add exclusion for anvato-api-config This
 subdomain is causing CORS issues on wishtv.com. Fix #14655

---
 src/chrome/content/rules/AmazonAWS.com.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/chrome/content/rules/AmazonAWS.com.xml b/src/chrome/content/rules/AmazonAWS.com.xml
index e7bb5eda71d6..d169331cdaab 100644
--- a/src/chrome/content/rules/AmazonAWS.com.xml
+++ b/src/chrome/content/rules/AmazonAWS.com.xml
@@ -128,7 +128,13 @@
 			Breaks forecast.io radar images
 							-->
 		<exclusion pattern="^http://darkskysatellite(?:maps)?\.s3\.amazonaws\.com/" />
+		<!--
+			Breaks wishtv.com:
 
+				https://github.com/EFForg/https-everywhere/issues/14655
+		-->
+		<exclusion pattern="^http://anvato-api-config\.s3\.amazonaws.com/" />
+			<test url="http://anvato-api-config.s3.amazonaws.com/anvacks/anvato_mcp_lin_web_prod_4c36fbfd4d8d8ecae6488656e21ac6d1ac972749.json" />
 
 
 	<!--	Forced redirects:

From 452187c39e8556893aef90dcab5eca87e321ef9f Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Sat, 17 Feb 2018 08:48:55 +0100
Subject: [PATCH 2/4] [AmazonAWS.com] Clean up top comment

---
 src/chrome/content/rules/AmazonAWS.com.xml | 79 ----------------------
 1 file changed, 79 deletions(-)

diff --git a/src/chrome/content/rules/AmazonAWS.com.xml b/src/chrome/content/rules/AmazonAWS.com.xml
index d169331cdaab..f2575671ea13 100644
--- a/src/chrome/content/rules/AmazonAWS.com.xml
+++ b/src/chrome/content/rules/AmazonAWS.com.xml
@@ -1,60 +1,6 @@
 <!--
-	For rules that break image zoom, see AmazonWebServices-breakzoom.xml.
-
 	For other Amazon coverage, see Amazon.xml.
 
-
-	CDN buckets:
-
-		- ec7.images-amazon.com.cdn20.com
-
-			- ec7.images-amazon.com
-
-		- ec4.images-amazon.chinacache.net
-
-			- ec4.images-amazon.com
-
-		- d1ge0kk1l5kms0.cloudfront.net
-
-			- ec[5x].images-amazon.com
-			- g-ecx.images-amazon.com
-
-		- d36cz9buwru1tt.cloudfront.net
-		- s3.amazonaws.com/awsmedia/
-		- s3.amazonaws.com/rodica-work/
-		- images-(eu|fe|na).ssl-images-amazon.com.edgekey.net
-
-		- ecx.images-amazon.com.c.footprint.net
-
-			- images.amazon.com
-			- images-jp.amazon.com
-			- rcm-images.amazon.com
-
-		- ec2.images-amazon.com.edgesuite.net
-
-			- ec2.images.amazon.com
-
-		- ec8.images-amazon.com.edgesuite.net
-
-			- ec8.images-amazon.com
-
-		- ec3.images-amazon.com.c.footprint.net
-
-			- ec[13].images-amazon.com
-
-		- g-ecx.images-amazon.com.c.footprint.net
-
-			- g-images.amazon.com
-
-		- z-ecx.images-amazon.com.edgesuite.net
-
-			- z-ak.images-amazon.com
-
-		- amazonrtl.vo.llnwd.net
-
-			- ec6.images-amazon.com
-
-
 	Nonfunctional domains:
 
 		- cloudfront-labs.amazonaws.com		(refused)
@@ -62,35 +8,10 @@
 
 	Problematic domains:
 
-		- z-ak.images-amazon.com			(503, akamai)
 		- (.+.)s3-website-eu-west-1.amazonaws.com
 		- (.+.)s3-website-us-east-1.amazonaws.com
 
 
-	Fully covered domains:
-
-		- forums.aws.amazon.com
-		- images-jp.amazon.com				(→ images-na.ssl-images-amazon.com)
-		- g-images.amazon.com				(→ d1ge0kk1l5kms0.cloudfront.net)
-		- webservices.amazon.com
-
-		- amazonaws.com subdomains:
-
-			- (.+.)s3
-			- (.+.)s3-ap-northeast-1
-			- (.+.)s3-ap-southeast-1
-			- (.+.)s3-external-[123]
-			- s3-eu-central-1
-			- (.+.)s3-eu-west-1
-			- (.+.)s3-sa-east-1
-			- (.+.)s3-us-west-1
-			- (.+.)s3-us-west-2
-			- (.+.)s3-website-eu-west-1		(→ s3-eu-west-1)
-			- (.+.)s3-website-us-east-1		(→ s3)
-
-		- g-ecx.images-amazon.com			(→ d1ge0kk1l5kms0.cloudfront.net)
-		- z-ak.images-amazon.com
-
 -->
 <ruleset name="AmazonWebServices">
 

From f50fa9988453c184dffd39e57cc38f16850b40d6 Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Sun, 18 Feb 2018 09:08:15 +0100
Subject: [PATCH 3/4] [AmazonAWS.com] Remove duplicate tests

---
 src/chrome/content/rules/AmazonAWS.com.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/chrome/content/rules/AmazonAWS.com.xml b/src/chrome/content/rules/AmazonAWS.com.xml
index f2575671ea13..09b05f7f50ae 100644
--- a/src/chrome/content/rules/AmazonAWS.com.xml
+++ b/src/chrome/content/rules/AmazonAWS.com.xml
@@ -147,8 +147,6 @@
 		<exclusion pattern="^http://amazon-zg\.s3\.amazonaws\.com/" />
 
 
-	<test url="http://dis.images.s3.amazonaws.com/" />
-	<test url="http://dis.resized.images.s3.amazonaws.com/" />
 	<test url="http://cms.kiva.org.s3.amazonaws.com/" />
 	<test url="http://s3.amazonaws.com/" />
 	<test url="http://s3-ap-northeast-1.amazonaws.com/" />

From 32b95f8f783e478cbedb425472fca6bc1cfc0346 Mon Sep 17 00:00:00 2001
From: Hugo Gruson <hugo.gruson@protonmail.com>
Date: Sun, 18 Feb 2018 11:08:58 +0100
Subject: [PATCH 4/4] [AmazonAWS.com] Add more info in comment

---
 src/chrome/content/rules/AmazonAWS.com.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/AmazonAWS.com.xml b/src/chrome/content/rules/AmazonAWS.com.xml
index 09b05f7f50ae..b60102abe425 100644
--- a/src/chrome/content/rules/AmazonAWS.com.xml
+++ b/src/chrome/content/rules/AmazonAWS.com.xml
@@ -50,9 +50,15 @@
 							-->
 		<exclusion pattern="^http://darkskysatellite(?:maps)?\.s3\.amazonaws\.com/" />
 		<!--
-			Breaks wishtv.com:
+			Breaks wishtv.com and videos on many websites:
 
+				https://github.com/EFForg/https-everywhere/issues/4510
 				https://github.com/EFForg/https-everywhere/issues/14655
+
+				tests:
+					http://thefreethoughtproject.com/red-light-robin-hood-hero-risks-years-jail-free-citizens-unlawful-red-light-cameras/
+					http://www.wsbtv.com/news/local/north-fulton-county/1-dead-in-attempted-robbery-at-buckhead-jewelry-store/389269261
+					http://sacramento.cbslocal.com/2016/07/06/california-gun-law-changes-have-advocates-up-in-arms/
 		-->
 		<exclusion pattern="^http://anvato-api-config\.s3\.amazonaws.com/" />
 			<test url="http://anvato-api-config.s3.amazonaws.com/anvacks/anvato_mcp_lin_web_prod_4c36fbfd4d8d8ecae6488656e21ac6d1ac972749.json" />