Skip to content

Commit c67522a

Browse files
pdepde
committed
Merge remote-tracking branch 'negres/master'
2 parents 635f807 + 984a977 commit c67522a

116 files changed

Lines changed: 2018 additions & 109 deletions

File tree

Some content is hidden

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

‎src/chrome/content/rules/3dglassesfree.com.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!--
2+
CDN buckets:
3+
4+
- s3.amazonaws.com/magnetic3d/
5+
- s3.amazonaws.com/magnetic3d_development/
6+
7+
8+
^ times out over http.
9+
10+
11+
Some pages redirect to http.
12+
13+
-->
14+
<ruleset name="3dglassesfree.com (partial)">
15+
16+
<target host="www.3dglassesfree.com" />
17+
18+
19+
<rule from="^http://www\.3dglassesfree\.com/(?=favicon\.ico|images/|stylesheets/)"
20+
to="https://www.3dglassesfree.com/" />
21+
22+
</ruleset>

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@
77
88
* Times out
99
10+
11+
Fully covered domains:
12+
13+
- aftonbladet.se subdomains:
14+
15+
- ads
16+
17+
18+
Observed cookie domains:
19+
20+
- ads.aftonbladet.se
21+
1022
-->
1123
<ruleset name="Aftonbladet">
1224

@@ -15,13 +27,13 @@
1527
<target host="*.aftonbladet-cdn.se" />
1628

1729

18-
<securecookie host="^(?:\.smetrics)?\.aftonbladet\.se$" name=".+" />
30+
<securecookie host="^(?:ads|\.smetrics)?\.aftonbladet\.se$" name=".+" />
1931

2032

2133
<rule from="^http://(?:(?:www\.)?aftonbladet|gfx2?\.aftonbladet-cdn)\.se/"
2234
to="https://www.aftonbladet.se/" />
2335

24-
<rule from="^http://(login|smetrics)\.aftonbladet\.se/"
36+
<rule from="^http://(ads|login|smetrics)\.aftonbladet\.se/"
2537
to="https://$1.aftonbladet.se/" />
2638

27-
</ruleset>
39+
</ruleset>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
Doesn't work:
1717
1818
- gp/search\?
19+
- lm/
1920
- /mn/search/
2021
- s/
2122
- s\?rh= (i.e. search pages and files)
@@ -30,7 +31,7 @@
3031
<!--
3132
Search redirects to http, for all sites.
3233
-->
33-
<exclusion pattern="^http://www\.amazon\.[\w\.]+/(?:gp/search\?|mn/search(?:$|\?)|s(?:/|\?rh=))" />
34+
<exclusion pattern="^http://www\.amazon\.[\w\.]+/(?:gp/search\?|lm/|mn/search(?:$|\?)|s(?:/|\?rh=))" />
3435

3536

3637
<!-- Verified as working for UK, other sites matched appear to function identically.
@@ -54,4 +55,4 @@
5455
<rule from="^http://(aan|local)\.amazon\.co\.uk/"
5556
to="https://$1.amazon.co.uk/" />
5657

57-
</ruleset>
58+
</ruleset>

‎src/chrome/content/rules/Automatak.net.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<ruleset name="Automatak.net">
2+
3+
<target host="automatak.net" />
4+
<target host="www.automatak.net" />
5+
6+
7+
<rule from="^http://(www\.)?automatak\.net/"
8+
to="https://$1automatak.net/" />
9+
10+
</ruleset>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
3636
- cdnedge *
3737
- confluence.dev (handshake error)
38-
38+
- ftp.kw (401, self-signed)
3939
- open.live
4040
- m **
4141

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<ruleset name="Biotrim Labs.com">
2+
3+
<target host="biotrimlabs.com" />
4+
<target host="*.biotrimlabs.com" />
5+
6+
7+
<securecookie host="^(?:w*\.)?biotrimlabs\.com$" name=".+" />
8+
9+
10+
<rule from="^http://(www\.)?biotrimlabs\.com/"
11+
to="https://$1biotrimlabs.com/" />
12+
13+
</ruleset>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<ruleset name="Blue Jeans Cable.com">
2+
3+
<target host="bluejeanscable.com" />
4+
<target host="www.bluejeanscable.com" />
5+
6+
7+
<securecookie host="^www\.bluejeanscable\.com$" name=".+" />
8+
9+
10+
<rule from="^http://(www\.)?bluejeanscable\.com/"
11+
to="https://$1bluejeanscable.com/" />
12+
13+
</ruleset>

‎src/chrome/content/rules/BrightFort.com-problematic.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!--
2+
For rules that are on by default, see BrightFort.com.xml.
3+
4+
-->
5+
<ruleset name="BrightFort.com (mismatched)" default_off="mismatched">
6+
7+
<target host="blog.brightfort.com" />
8+
9+
10+
<rule from="^http://blog\.brightfort\.com/"
11+
to="https://blog.brightfort.com/" />
12+
13+
</ruleset>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!--
2+
For problematic rules, see BrightFort.com-problematic.xml.
3+
4+
5+
Problematic subdomains:
6+
7+
- blog (works; mismatched, CN: blog.javacoolsoftware.com)
8+
9+
-->
10+
<ruleset name="BrightFort.com (partial)">
11+
12+
<target host="brightfort.com" />
13+
<target host="www.brightfort.com" />
14+
15+
16+
<rule from="^http://(www\.)?brightfort\.com/"
17+
to="https://$1brightfort.com/" />
18+
19+
</ruleset>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!--
2+
Problematic subdomains:
3+
4+
- ^ (dropped)
5+
6+
7+
CN: *.cloudfront.net
8+
9+
-->
10+
<ruleset name="broadbandchoices.co.uk" default_off="mismatched">
11+
12+
<target host="broadbandchoices.co.uk" />
13+
<target host="www.broadbandchoices.co.uk" />
14+
15+
16+
<rule from="^http://(?:www\.)?broadbandchoices\.co\.uk/"
17+
to="https://www.broadbandchoices.co.uk/" />
18+
19+
</ruleset>

0 commit comments

Comments
 (0)