Skip to content

Commit 4f3e767

Browse files
pdepde
committed
Merge branch 'master' of ssh://github.com/EFForg/https-everywhere
2 parents c049cdf + db8ce35 commit 4f3e767

File tree

13 files changed

+33
-20
lines changed

13 files changed

+33
-20
lines changed

‎makecrx.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ version_hex="0200 0000" # 2
135135
pub_len_hex=$(byte_swap $(printf '%08x\n' $(ls -l "$pub" | awk '{print $5}')))
136136
sig_len_hex=$(byte_swap $(printf '%08x\n' $(ls -l "$sig" | awk '{print $5}')))
137137
(
138-
echo "$crmagic_hex $version_hex $pub_len_hex $sig_len_hex" | xxd -r -p
138+
echo "$crmagic_hex $version_hex $pub_len_hex $sig_len_hex" | sed -e 's/\s//g' -e 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf
139139
cat "$pub" "$sig" "$zip"
140140
) > "$crx"
141141
#rm -rf pkg/crx

‎src/Changelog‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
3.5.1 (2014-04-25)
2+
* Revert https://github.com/EFForg/https-everywhere/pull/134 due to YouTube
3+
breakage.
4+
* Re-enable ability to see all rulesets in enable/disable dialog.
5+
* Added more Debian coverage.
6+
* Fixes to Doubleclick, Guardian, Heroku, Home Depot, HypeMachine, IMDB,
7+
Justin.tv, Kikatek, Mozilla, MyFitnessPal, Pinterest, XKCD, Reuters,
8+
Technet, Tumblr, Wordpress, Yandex, Youtube, Flickr.
9+
* Fix Australis icon positioning:
10+
https://github.com/EFForg/https-everywhere/pull/216
11+
12+
chrome-2014.4.25
13+
* Ruleset fixes (same as 3.5.1)
14+
115
chrome-2014.4.16
216
* Make Chrome build script compatible with Chrome release scripts.
317
* Fix disappearing icon: https://github.com/EFForg/https-everywhere/pull/220

‎src/chrome/content/rules/EdgeCast-networks.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
55
-->
6-
<ruleset name="EdgeCast Networks (partial)">
6+
<ruleset name="EdgeCast Networks (partial)" default_off="It remains to be determined which URLs indicate SSL support">
77

88
<target host="wac.*.edgecastcdn.net" />
99
<target host="wpc.*.edgecastcdn.net" />

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
- static-ak.hypem.net (→ static.hypem.net)
2020
2121
-->
22-
<ruleset name="HypeMachine (partial)">
23-
24-
<target host="hypem.com" />
25-
<target host="*.hypem.com" />
22+
<ruleset name="HypeMachine (not supported)" default_off="Full SSL not supported">
23+
<target host="hypem.com" />
24+
<target host="*.hypem.com" />
2625
<!--
2726
Pages 501:
2827

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@
2424

2525
<target host="imdb.com"/>
2626
<target host="*.imdb.com"/>
27-
<!-- i: Akamai -->
28-
<target host="*.media-imdb.com"/>
29-
<exclusion pattern="^http://([^/:@]+\.)?imdb\.com/images/a/ifb/doubleclick/expand\.html" />
27+
<exclusion pattern="^http://([^/:@]+\.)?imdb\.com/images/(jwplayer|a/ifb/doubleclick/expand\.html)" />
3028

3129
<rule from="^http://(?:www\.)?imdb\.com/(images|rg)/"
3230
to="https://secure.imdb.com/$1/"/>
3331

3432
<rule from="^http://(?:secure\.|(?:i|www)\.media-)imdb\.com/"
3533
to="https://secure.imdb.com/"/>
3634

37-
<rule from="^http://ia\.media-imdb\.com/"
38-
to="https://images-na.ssl-images-amazon.com/" />
39-
4035
</ruleset>

‎src/chrome/content/rules/Justin.tv.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@
4747
<rule from="^http://api\.twitch\.tv/" to="https://api.twitch.tv/"/>
4848

4949
<rule from="^http://chatdepot\.twitch\.tv/" to="https://chatdepot.twitch.tv/"/>
50+
51+
<rule from="^http://secure\.twitch\.tv/" to="https://secure.twitch.tv/" />
5052
</ruleset>

‎src/chrome/content/rules/MacWorld.com.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Times out
1212
1313
-->
14-
<ruleset name="MacWorld.com" platform="mixedcontent">
14+
<ruleset name="MacWorld.com (broken)" default_off="doesn't support SSL">
1515

1616
<target host="macworld.com" />
1717
<target host="www.macworld.com" />
@@ -20,4 +20,4 @@
2020
<rule from="^http://(www\.)?macworld\.com/"
2121
to="https://$1macworld.com/" />
2222

23-
</ruleset>
23+
</ruleset>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
<target host="*.firefox.com" />
251251
<target host="mozilla.com" />
252252
<target host="*.mozilla.com" />
253-
<exclusion pattern="^http://(?:www\.authstage|identity|www-trunk\.stage)\.mozilla\.com/" />
253+
<exclusion pattern="^http://(?:www\.authstage|fxfeeds|identity|www-trunk\.stage)\.mozilla\.com/" />
254254
<target host="mozilla.net" />
255255
<target host="*.mozilla.net" />
256256
<exclusion pattern="^http://(?:cdn|hardhat)\.mozilla\.net/" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
<target host="reddit.com" />
88
<target host="*.reddit.com" />
9-
<exclusion pattern="^http://blog\." />
9+
<exclusion pattern="^https?://blog\." />
1010
<!--
1111
These domains are handled in Reddit.xml:
1212
-->
13-
<exclusion pattern="^http://(?:ssl|static|thumbs)\." />
13+
<exclusion pattern="^https?://(?:ssl|static|thumbs)\." />
1414
<!--
1515
As are social media widgets:
1616
-->
17-
<exclusion pattern="^http://(?:www\.)?reddit\.com/static/" />
17+
<exclusion pattern="^https?://(?:www\.)?reddit\.com/static/" />
1818

1919

2020
<securecookie host=".*\.reddit\.com$" name=".+" />

‎src/chrome/content/rules/Technet.com.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
blogs.technet.com, however, does.
1212
1313
-->
14-
<ruleset name="Technet.com (partial)">
14+
<ruleset name="Technet.com (broken)" default_off="broken">
1515

1616
<target host="blogs.technet.com" />
1717
<target host="*.blogs.technet.com" />

0 commit comments

Comments
 (0)