Skip to content

Commit ba5bf5d

Browse files
jshajsha
committed
Merge branch 'master' of github.com:EFForg/https-everywhere into anand-bhat-sfconservancy.org
Conflicts: src/chrome/content/rules/Software_Freedom_Conservancy.xml
2 parents c389cbc + 81df423 commit ba5bf5d

File tree

138 files changed

+1142
-1445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+1142
-1445
lines changed

‎https-everywhere-tests/test_profile_skeleton/prefs.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ user_pref("extensions.https_everywhere.toolbar_hint_shown", true);
66
// Show all logs.
77
user_pref("extensions.https_everywhere.LogLevel", 0);
88
user_pref("extensions.https_everywhere.log_to_stdout", true);
9-
// Allow running of Mixed Content Blocking tests.
10-
user_pref("extensions.https_everywhere.show_ruleset_tests", true);
119
// Make it quicker to make manual config changes.
1210
user_pref("general.warnOnAboutConfig", false);
1311
// Minimize unnecesary requests.

‎src/chrome/content/code/ApplicableList.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ ApplicableList.prototype = {
213213
},
214214

215215
add_command: function(rule) {
216-
var command = this.document.createElement("command");
216+
var command = this.document.getElementById("https-everywhere-menuitem-rule-toggle-template").cloneNode();
217217
command.setAttribute('id', JSON.stringify(rule.id)+'-command');
218+
command.setAttribute('data-id', JSON.stringify(rule.id));
218219
command.setAttribute('label', rule.name);
219-
command.setAttribute('oncommand', 'toggle_rule("'+JSON.stringify(rule.id)+'")');
220220
this.commandset.appendChild(command);
221221
},
222222

‎src/chrome/content/code/NSS.js‎

Lines changed: 200 additions & 197 deletions
Large diffs are not rendered by default.

‎src/chrome/content/rules/About_My_Vote.co.uk.xml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://aboutmyvote.co.uk/ => https://www.aboutmyvote.co.uk/: (60, 'SSL certificate problem: unable to get local issuer certificate')
4-
Fetch error: http://www.aboutmyvote.co.uk/ => https://www.aboutmyvote.co.uk/: (60, 'SSL certificate problem: unable to get local issuer certificate')
52
^: 404
63
74
@@ -13,20 +10,18 @@ Fetch error: http://www.aboutmyvote.co.uk/ => https://www.aboutmyvote.co.uk/: (6
1310
* Secured by us
1411
1512
-->
16-
<ruleset name="About My Vote.co.uk" default_off='failed ruleset test'>
17-
13+
<ruleset name="About My Vote.co.uk">
1814
<target host="aboutmyvote.co.uk" />
1915
<target host="www.aboutmyvote.co.uk" />
2016

21-
2217
<!-- Not secured by server:
2318
-->
2419
<!--securecookie host="^www\.aboutmyvote\.co\.uk$" name="^SQ_SYSTEM_SESSION$" /-->
2520

2621
<securecookie host="^www\.aboutmyvote\.co\.uk$" name=".+" />
2722

28-
29-
<rule from="^http://(?:www\.)?aboutmyvote\.co\.uk/"
23+
<rule from="^http://aboutmyvote\.co\.uk/"
3024
to="https://www.aboutmyvote.co.uk/" />
31-
25+
<rule from="^http:"
26+
to="https:" />
3227
</ruleset>

‎src/chrome/content/rules/Alphabet.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ruleset name="Alphabet">
2+
3+
<target host="abc.xyz" />
4+
<target host="www.abc.xyz" />
5+
6+
<rule from="^http:"
7+
to="https:" />
8+
9+
</ruleset>

‎src/chrome/content/rules/AustralianSportsCommissionLearningPortal.xml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://learning.ausport.gov.au/ => https://learning.ausport.gov.au/: (60, 'SSL certificate problem: unable to get local issuer certificate')
4-
-->
5-
<ruleset name="Australian Sports Commission Learning Portal" default_off='failed ruleset test'>
1+
<ruleset name="Australian Sports Commission Learning Portal">
62
<target host="learning.ausport.gov.au" />
7-
<target host="*.learning.ausport.gov.au" />
83

9-
<rule from="^http://(?:www\.)?learning\.ausport\.gov\.au/"
10-
to="https://learning.ausport.gov.au/" />
11-
</ruleset>
4+
<rule from="^http:"
5+
to="https:" />
6+
</ruleset>

‎src/chrome/content/rules/BitBucket.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333

3434
<!-- Direct rewrites:
3535
-->
36+
<target host="bitbucket.com" />
37+
<target host="www.bitbucket.com" />
38+
3639
<target host="bitbucket.org" />
3740
<target host="blog.bitbucket.org" />
3841
<target host="www.bitbucket.org" />

‎src/chrome/content/rules/Blog_Top_Sites.xml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://blogtopsites.com/ => https://blogtopsites.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
42
CDN buckets:
53
64
- blogtopsites.s3.amazonaws.com
@@ -13,16 +11,12 @@ Fetch error: http://blogtopsites.com/ => https://blogtopsites.com/: (60, 'SSL ce
1311
* Secured by us
1412
1513
-->
16-
<ruleset name="Blog Top Sites.com" default_off='failed ruleset test'>
17-
14+
<ruleset name="Blog Top Sites.com">
1815
<target host="blogtopsites.com" />
19-
<target host="*.blogtopsites.com" />
20-
16+
<target host="www.blogtopsites.com" />
2117

2218
<securecookie host="^\.blogtopsites\.com$" name=".+" />
2319

24-
25-
<rule from="^http://(www\.)?blogtopsites\.com/"
26-
to="https://$1blogtopsites.com/" />
27-
20+
<rule from="^http:"
21+
to="https:" />
2822
</ruleset>

‎src/chrome/content/rules/Boomerang.xml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://boomerang.com/ => https://boomerang.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
42
Nonfunctional subdomains:
53
64
- blogs
75
- home (valid cert; prints "systems are undergoing maintenance at this time")
86
- loyalty
7+
- ss (refused)
98
109
-->
11-
<ruleset name="Boomerang (partial)" default_off='failed ruleset test'>
12-
10+
<ruleset name="Boomerang (partial)">
1311
<target host="boomerang.com" />
14-
<target host="*.boomerang.com" />
15-
16-
17-
<securecookie host="^ss\.boomerang\.com$" name=".*" />
18-
19-
20-
<rule from="^http://(imagestore2?\.|ss\.|www\.)?boomerang\.com/"
21-
to="https://$1boomerang.com/" />
12+
<target host="www.boomerang.com" />
13+
<target host="imagestore2.boomerang.com" />
2214

15+
<rule from="^http:"
16+
to="https:" />
2317
</ruleset>

‎src/chrome/content/rules/Bugzilla.xml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,9 @@
99
* Refused
1010
1111
12-
Problematic hosts in *bugzilla.org:
13-
14-
- ^ *
15-
16-
* Mismatched
17-
18-
1912
Fully covered hosts in *bugzilla.org:
2013
21-
- (www.)? (^ → www)
14+
- (www.)?
2215
- landfill
2316
- lists
2417
@@ -27,18 +20,11 @@
2720

2821
<!-- Direct rewrites:
2922
-->
23+
<target host="bugzilla.org" />
3024
<target host="landfill.bugzilla.org" />
3125
<target host="lists.bugzilla.org" />
3226
<target host="www.bugzilla.org" />
3327

34-
<!-- Complications:
35-
-->
36-
<target host="bugzilla.org" />
37-
38-
39-
<rule from="^http://bugzilla\.org/"
40-
to="https://www.bugzilla.org/" />
41-
4228
<rule from="^http:"
4329
to="https:" />
4430

0 commit comments

Comments
 (0)