Merge remote-tracking branch 'efforg/master' into personal-rulesets

MB · MB · commit 6bb52b538e35 · 2015-03-26T18:00:00.000Z
diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
@@ -74,6 +74,9 @@ const HTTPS = {
       var domain = null;
       try { domain = channel.URI.host; } catch (e) {}
       if (domain) https_blacklist_domains[domain] = true;
+      if (httpNowhereEnabled && channel.URI.schemeIs("http")) {
+        IOUtil.abort(channel);
+      }
       return false;
     }
 
diff --git a/src/chrome/content/rules/MediaNet.xml b/src/chrome/content/rules/MediaNet.xml
@@ -1,21 +1,9 @@
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://images.musicnet.com/ => https://images.musicnet.com/: (56, 'Recv failure: Connection reset by peer')
--->
-<ruleset name="MediaNet (partial)" platform="mixedcontent" default_off='failed ruleset test'>
-
+<ruleset name="MediaNet">
 	<target host="mndigital.com" />
 	<target host="www.mndigital.com" />
-	<target host="images.musicnet.com" />
-
 
 	<securecookie host="^www\.mndigital\.com$" name=".*" />
 
-
-	<rule from="^http://(www\.)?mndigital\.com/"
-		to="https://$1mndigital.com/" />
-
-	<rule from="^http://images\.musicnet\.com/"
-		to="https://images.musicnet.com/" />
-
+	<rule from="^http:"
+		to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/PeerJ.xml b/src/chrome/content/rules/PeerJ.xml
@@ -14,6 +14,6 @@
 
 
 	<rule from="^http://(www\.)?peerj\.com/"
-		to="https://$1peerj.com/$2" />
+		to="https://$1peerj.com/" />
 
-</ruleset>
+</ruleset>

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ const HTTPS = {`
`74`	`74`	`var domain = null;`
`75`	`75`	`try { domain = channel.URI.host; } catch (e) {}`
`76`	`76`	`if (domain) https_blacklist_domains[domain] = true;`
	`77`	`+ if (httpNowhereEnabled && channel.URI.schemeIs("http")) {`
	`78`	`+ IOUtil.abort(channel);`
	`79`	`+ }`
`77`	`80`	`return false;`
`78`	`81`	`}`
`79`	`82`