Remove duplicated target gdata.youtube.com (EFForg#12539)

Bisaloo · J0WI · commit 7c49ac154b15 · 2017-09-18T22:54:43.000+02:00
* Remove duplicated target gdata.youtube.com

* [YouTube] Add test urls for gdata.youtube.com

* [YouTube] Remove broken target (time out)

* [YouTube] Remove broken target
diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
@@ -58,8 +58,6 @@
 			- ssl
 			- t\d
 
-		- gdata.youtube.com
-
 
 -->
 <ruleset name="Google APIs">
@@ -86,7 +84,6 @@
 
 	<target host="gstatic.com" />
 	<target host="*.gstatic.com" />
-	<target host="gdata.youtube.com" />
 
 	<!--	Captive portal detection redirects to this URL, and many captive
 		portals break TLS, so exempt this redirect URL.
@@ -95,9 +92,6 @@
 	<exclusion pattern="^http://www\.gstatic\.com/generate_204" />
 		<test url="http://www.gstatic.com/generate_204" />
 
-	<exclusion pattern="^http://gdata\.youtube\.com/crossdomain\.xml" />
-		<test url="http://gdata.youtube.com/crossdomain.xml" />
-	
 	<!--	Breaks digitalattackmap.com, cf.
 		https://trac.torproject.org/projects/tor/ticket/15154
 			-->
@@ -153,6 +147,4 @@
 		<test url="http://t2.gstatic.com/" />
 		<test url="http://t3.gstatic.com/" />
 
-	<rule from="^http://gdata\.youtube\.com/"
-		to="https://gdata.youtube.com/" />
 </ruleset>
diff --git a/src/chrome/content/rules/YouTube.xml b/src/chrome/content/rules/YouTube.xml
@@ -1,6 +1,8 @@
 <!--
 	Time out over both http and https:
 		youtube.tn
+		youtube.com.tn
+		www.youtube.com.tn
 
 	Insecure cookies are set for these domains:
 
@@ -12,6 +14,8 @@
         <!-- Main domains -->
 	<target host="youtube.com" />
 	<target host="*.youtube.com" />
+		<test url="http://gdata.youtube.com/" />
+		<test url="http://gdata.youtube.com/crossdomain.xml" />
 		<test url="http://m.youtube.com/feed/trending" />
 		<test url="http://www.youtube.com/opensearch?locale=en_US" />
 		<test url="http://www.youtube.com/yts/img/pixel-vfl3z5WfW.gif" />
@@ -214,8 +218,8 @@
 	<target host="www.youtube.co.th"/>
 	<!--target host="youtube.tn"/-->
 	<target host="www.youtube.tn"/>
-	<target host="youtube.com.tn"/>
-	<target host="www.youtube.com.tn"/>
+	<!--target host="youtube.com.tn"/-->
+	<!--target host="www.youtube.com.tn"/-->
 	<target host="youtube.com.tr"/>
 	<target host="www.youtube.com.tr"/>
 	<target host="youtube.com.tw"/>
