Merge pull request EFForg#5328 from mnordhoff/c.xkcd.com-downgrade

Hainish · web-flow · commit ac95970f3e2b · 2016-07-14T15:13:02.000-07:00
[xkcd] Downgrade https://c.xkcd.com/ to http
diff --git a/src/chrome/content/rules/xkcd.xml b/src/chrome/content/rules/xkcd.xml
@@ -56,7 +56,6 @@
 	<target host="xkcd.com" />
 	<target host="3d.xkcd.com" />
 	<!--
-	<target host="c.xkcd.com" />
 	<target host="c0.xkcd.com" />
 	<target host="c1.xkcd.com" />
 	<target host="c2.xkcd.com" />
@@ -79,6 +78,7 @@
 
 	<!--	Complications:
 				-->
+	<target host="c.xkcd.com" />
 	<target host="www.store.xkcd.com" />
 
 	<target host="xkcd.org" />
@@ -88,15 +88,22 @@
 
         <exclusion pattern="^http://(www\.|m\.)?xkcd\.com/1663/" />
 
+		<test url="http://xkcd.com/1663/" />
+		<test url="http://m.xkcd.com/1663/" />
+		<test url="http://www.xkcd.com/1663/" />
 
-        <test url="http://xkcd.com/1663/" />
-        <test url="http://m.xkcd.com/1663/" />
-        <test url="http://www.xkcd.com/1663/" />
+	<exclusion pattern="^http://c\.xkcd\.com/" />
 
 
 	<rule from="^http://(www\.|m\.)?xkcd\.org/"
 		to="https://$1xkcd.com/" />
 
+	<rule from="^https://c\.xkcd\.com/"
+		to="http://c.xkcd.com/"
+		downgrade="1" />
+
+		<test url="https://c.xkcd.com/" />
+
 	<rule from="^http://www\.store\.xkcd\.com/"
 		to="https://store.xkcd.com/" />
 
diff --git a/utils/downgrade-whitelist.txt b/utils/downgrade-whitelist.txt
@@ -22,4 +22,5 @@ SRG SSR (partial)
 Stack Exchange (partial)
 University of Alaska Anchorage (partial)
 Visa (partial)
+xkcd
 Youku.com (partial)
