[Stallman.org] Simplify ruleset (#11213)

EFForg · Jul 19, 2017 · 11c5eba · 11c5eba
1 parent 79d77c7
commit 11c5eba
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/src/chrome/content/rules/Stallman.org.xml b/src/chrome/content/rules/Stallman.org.xml
@@ -1,21 +1,14 @@
+<!--
+	Invalid certificate:
+		ww.stallman.org
+
+-->
 <ruleset name="Stallman.org">
+
 	<target host="stallman.org" />
-	<target host="ww.stallman.org" />
 	<target host="www.stallman.org" />
 
-	<test url="http://stallman.org/" />
-	<test url="http://www.stallman.org/" />
-	<test url="http://ww.stallman.org/" />
-	<test url="https://ww.stallman.org/" />
+	<rule from="^http:"
+		to="https:" />
 
-	<!-- The stallman.org site does in fact have a
-	working ww (not a typo) subdomain that supports
-	HTTPS (but with a certificate mismatch error)
-	and which has the same content as the normal
-	www subdomain. As such, the ww subdomain is
-	redirected to the www subdomain. -->
-	<rule from="^https?://ww\.stallman\.org/"
-		to="https://www.stallman.org/" />
-	<rule from="^http://(www\.)?stallman\.org/"
-		to="https://$1stallman.org/" />
 </ruleset>