Skip to content

Commit 396d07f

Browse files
julianladischjulianladisch
committed
Merge upstream/master, including Startcom EFForg#1901, disable hosts startcom.org and auth.startssl.com
2 parents 946f1c6 + 7e6ad03 commit 396d07f

File tree

158 files changed

+1892
-796
lines changed

Some content is hidden

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

158 files changed

+1892
-796
lines changed

‎src/chrome/content/rules/3FM.xml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://3fm.nl/ => https://3fm.nl/: (28, 'Connection timed out after 10000 milliseconds')
4-
-->
5-
<ruleset name="3FM" default_off='failed ruleset test'>
6-
7-
<target host="3fm.nl" />
1+
<ruleset name="3FM">
82
<target host="www.3fm.nl" />
93

10-
11-
<rule from="^http://(www\.)?3fm\.nl/"
12-
to="https://$13fm.nl/" />
13-
14-
</ruleset>
4+
<rule from="^http:"
5+
to="https:" />
6+
</ruleset>

‎src/chrome/content/rules/99.se.xml‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

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

Lines changed: 106 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,147 +1,140 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://aldisued.de/ => https://www.aldi-sued.de/: (6, 'Could not resolve host: aldisued.de')
2+
Missmatch:
3+
- games.aldi-sued.de
4+
- games.aldi-suisse.ch
5+
- inoc.aldi-suisse.ch
6+
- games.aldi.co.uk
7+
- games.aldi.com.au
8+
- newsletter.aldi.dk
9+
- newsletter.aldi.es
10+
- haziasszonyok.aldi.hu
11+
- games.aldi.hu
12+
- games.aldi.us
13+
- weeklyads.aldi.us
14+
- games.hofer.at
15+
- *gutaiderbichl.hofer.at
16+
- games.hofer.si
17+
18+
No response:
19+
- herkunft.aldi-sued.de
20+
- aldi.es
21+
22+
Refused:
23+
- transparenz.aldi-nord.de
24+
- *aldi.com
425
-->
5-
<ruleset name="Aldi" default_off='failed ruleset test'>
6-
<target host="aldisued.de"/>
7-
<target host="*.aldi-mobile.ch"/>
8-
<target host="*.aldi-nord.de"/>
9-
<target host="*.aldi-sued.de"/>
10-
<target host="*.aldi-suisse.ch"/>
11-
<target host="*.aldi.be"/>
12-
<target host="*.aldi.co.uk"/>
13-
<target host="*.aldi.com.au"/>
14-
<target host="*.aldi.dk"/>
15-
<target host="*.aldi.es"/>
16-
<target host="*.aldi.fr"/>
17-
<target host="*.aldi.hu"/>
18-
<target host="*.aldi.ie"/>
19-
<target host="*.aldi.lu"/>
20-
<target host="*.aldi.nl"/>
21-
<target host="*.aldi.pl"/>
22-
<target host="*.aldi.pt"/>
23-
<target host="*.aldi.us"/>
24-
<target host="*.aldinord.de"/>
25-
<target host="*.aldisued.de"/>
26-
<target host="*.aldisuisse.ch"/>
27-
<target host="*.alditalk.de"/>
28-
<target host="*.hofer.at"/>
29-
<target host="*.hofer.si"/>
26+
<ruleset name="Aldi">
3027
<target host="aldi-mobile.ch"/>
28+
<target host="www.aldi-mobile.ch"/>
29+
<target host="mypages.aldi-mobile.ch"/>
3130
<target host="aldi-nord.de"/>
31+
<target host="www.aldi-nord.de"/>
32+
<target host="m.aldi-nord.de"/>
3233
<target host="aldi-sued.de"/>
34+
<target host="www.aldi-sued.de"/>
35+
<target host="karriere.aldi-sued.de"/>
36+
<target host="unternehmen.aldi-sued.de"/>
3337
<target host="aldi-suisse.ch"/>
38+
<target host="www.aldi-suisse.ch"/>
39+
<target host="apps.aldi-suisse.ch"/>
40+
<target host="unternehmen.aldi-suisse.ch"/>
3441
<target host="aldi.be"/>
42+
<target host="www.aldi.be"/>
43+
<target host="de.aldi.be"/>
44+
<target host="fr.aldi.be"/>
45+
<target host="m.aldi.be"/>
46+
<target host="nl.aldi.be"/>
3547
<target host="aldi.co.uk"/>
48+
<target host="www.aldi.co.uk"/>
49+
<target host="corporate.aldi.co.uk"/>
50+
<target host="customerservice.aldi.co.uk"/>
3651
<target host="aldi.com.au"/>
52+
<target host="www.aldi.com.au"/>
53+
<target host="corporate.aldi.com.au"/>
54+
<target host="customerservice.aldi.com.au"/>
55+
<target host="ptp.aldi.com.au"/>
3756
<target host="aldi.dk"/>
57+
<target host="www.aldi.dk"/>
3858
<target host="aldi.es"/>
59+
<target host="www.aldi.es"/>
3960
<target host="aldi.fr"/>
61+
<target host="www.aldi.fr"/>
4062
<target host="aldi.hu"/>
63+
<target host="www.aldi.hu"/>
64+
<target host="recruiting.aldi.hu"/>
65+
<target host="avallalat.aldi.hu"/>
66+
<target host="eletmodvaltok.aldi.hu"/>
67+
<target host="borvilag.aldi.hu"/>
68+
<target host="www.borvilag.aldi.hu"/>
69+
<target host="hirlevel.aldi.hu"/>
70+
<target host="www.hirlevel.aldi.hu"/>
4171
<target host="aldi.ie"/>
72+
<target host="www.aldi.ie"/>
73+
<target host="corporate.aldi.ie"/>
74+
<target host="listening.aldi.ie"/>
4275
<target host="aldi.lu"/>
76+
<target host="www.aldi.lu"/>
77+
<target host="de.aldi.lu"/>
78+
<target host="fr.aldi.lu"/>
4379
<target host="aldi.nl"/>
80+
<target host="www.aldi.nl"/>
4481
<target host="aldi.pl"/>
82+
<target host="www.aldi.pl"/>
4583
<target host="aldi.pt"/>
84+
<target host="www.aldi.pt"/>
4685
<target host="aldi.us"/>
47-
<target host="aldinord.de"/>
48-
<target host="aldisuisse.ch"/>
86+
<target host="www.aldi.us"/>
87+
<target host="blog.aldi.us"/>
88+
<target host="corporate.aldi.us"/>
4989
<target host="alditalk.de"/>
90+
<target host="www.alditalk.de"/>
5091
<target host="hofer.at"/>
92+
<target host="www.hofer.at"/>
93+
<target host="unternehmen.hofer.at"/>
94+
<target host="s.hofer.at"/>
95+
<target host="gewinnspiel.hofer.at"/>
96+
<target host="karriere.hofer.at"/>
97+
<target host="vinothek.hofer.at"/>
98+
<target host="www.vinothek.hofer.at"/>
5199
<target host="hofer.si"/>
100+
<target host="www.hofer.si"/>
101+
<target host="kariera.hofer.si"/>
102+
<target host="daneszajutri.hofer.si"/>
103+
<target host="nagradnaigra.hofer.si"/>
104+
<target host="podjetje.hofer.si"/>
105+
<target host="vinoteka.hofer.si"/>
106+
<target host="www.vinoteka.hofer.si"/>
52107

53-
<rule from="^http://(?:www\.)?aldisued\.de/"
54-
to="https://www.aldi-sued.de/" />
55-
<rule from="^http://([^/:@]*)\.aldisued\.de/"
56-
to="https://$1.aldi-sued.de/" />
57-
<rule from="^http://(?:www\.)?aldi-mobile\.ch/"
108+
<rule from="^http://aldi-mobile\.ch/"
58109
to="https://www.aldi-mobile.ch/"/>
59-
<rule from="^http://([^/:@]*)\.aldi-mobile\.ch/"
60-
to="https://$1.aldi-mobile.ch/"/>
61-
<rule from="^http://(?:www\.)?aldi-nord\.de/"
62-
to="https://www.aldi-nord.de/" />
63-
<rule from="^http://([^/:@]*)\.aldi-nord\.de/"
64-
to="https://$1.aldi-nord.de/" />
65-
<rule from="^http://(?:www\.)?aldi-sued\.de/"
66-
to="https://www.aldi-sued.de/" />
67-
<rule from="^http://([^/:@]*)\.aldi-sued\.de/"
68-
to="https://$1.aldi-sued.de/" />
69-
<rule from="^http://(?:www\.)?aldi-suisse\.ch/"
110+
<rule from="^http://aldi-sued\.de/"
111+
to="https://www.aldi-sued.de/"/>
112+
<rule from="^http://aldi-suisse\.ch/"
70113
to="https://www.aldi-suisse.ch/"/>
71-
<rule from="^http://([^/:@]*)\.aldi-suisse\.ch/"
72-
to="https://$1.aldi-suisse.ch/"/>
73-
<rule from="^http://(?:www\.)?aldi\.be/"
114+
<rule from="^http://aldi\.be/"
74115
to="https://www.aldi.be/"/>
75-
<rule from="^http://([^/:@]*)\.aldi\.be/"
76-
to="https://$1.aldi.be/"/>
77-
<rule from="^http://(?:www\.)?aldi\.co\.uk/"
116+
<rule from="^http://aldi\.co\.uk/"
78117
to="https://www.aldi.co.uk/"/>
79-
<rule from="^http://([^/:@]*)\.aldi\.co\.uk/"
80-
to="https://$1.aldi.co.uk/"/>
81-
<rule from="^http://(?:www\.)?aldi\.com\.au/"
82-
to="https://www.aldi.com.au/"/>
83-
<rule from="^http://([^/:@]*)\.aldi\.com\.au/"
84-
to="https://$1.aldi.com.au/"/>
85-
<rule from="^http://(?:www\.)?aldi\.dk/"
86-
to="https://www.aldi.dk/"/>
87-
<rule from="^http://([^/:@]*)\.aldi\.dk/"
88-
to="https://$1.aldi.dk/"/>
89-
<rule from="^http://(?:www\.)?aldi\.es/"
118+
<rule from="^http://aldi\.es/"
90119
to="https://www.aldi.es/"/>
91-
<rule from="^http://([^/:@]*)\.aldi\.es/"
92-
to="https://$1.aldi.es/"/>
93-
<rule from="^http://(?:www\.)?aldi\.fr/"
94-
to="https://www.aldi.fr/"/>
95-
<rule from="^http://([^/:@]*)\.aldi\.fr/"
96-
to="https://$1.aldi.fr/"/>
97-
<rule from="^http://(?:www\.)?aldi\.hu/"
120+
<rule from="^http://aldi\.hu/"
98121
to="https://www.aldi.hu/"/>
99-
<rule from="^http://([^/:@]*)\.aldi\.hu/"
100-
to="https://$1.aldi.hu/"/>
101-
<rule from="^http://(?:www\.)?aldi\.ie/"
122+
<rule from="^http://hirlevel\.aldi\.hu/"
123+
to="https://www.hirlevel.aldi.hu/"/>
124+
<rule from="^http://borvilag\.aldi\.hu/"
125+
to="https://www.borvilag.aldi.hu/"/>
126+
<rule from="^http://aldi\.ie/"
102127
to="https://www.aldi.ie/"/>
103-
<rule from="^http://([^/:@]*)\.aldi\.ie/"
104-
to="https://$1.aldi.ie/"/>
105-
<rule from="^http://(?:www\.)?aldi\.lu/"
106-
to="https://www.aldi.lu/"/>
107-
<rule from="^http://([^/:@]*)\.aldi\.lu/"
108-
to="https://$1.aldi.lu/"/>
109-
<rule from="^http://(?:www\.)?aldi\.nl/"
110-
to="https://www.aldi.nl/"/>
111-
<rule from="^http://([^/:@]*)\.aldi\.nl/"
112-
to="https://$1.aldi.nl/"/>
113-
<rule from="^http://(?:www\.)?aldi\.pl/"
114-
to="https://www.aldi.pl/"/>
115-
<rule from="^http://([^/:@]*)\.aldi\.pl/"
116-
to="https://$1.aldi.pl/"/>
117-
<rule from="^http://(?:www\.)?aldi\.pt/"
118-
to="https://www.aldi.pt/"/>
119-
<rule from="^http://([^/:@]*)\.aldi\.pt/"
120-
to="https://$1.aldi.pt/"/>
121-
<rule from="^http://(?:www\.)?aldi\.us/"
128+
<rule from="^http://aldi\.us/"
122129
to="https://www.aldi.us/"/>
123-
<rule from="^http://([^/:@]*)\.aldi\.us/"
124-
to="https://$1.aldi.us/"/>
125-
<rule from="^http://(?:www\.)?aldinord\.de/"
126-
to="https://www.aldi-nord.de/" />
127-
<rule from="^http://([^/:@]*)\.aldinord\.de/"
128-
to="https://$1.aldi-nord.de/" />
129-
<rule from="^http://(?:www\.)?aldisued\.de/"
130-
to="https://www.aldi-sued.de/" />
131-
<rule from="^http://(?:www\.)?aldisuisse\.ch/"
132-
to="https://www.aldi-suisse.ch/"/>
133-
<rule from="^http://([^/:@]*)\.aldisuisse\.ch/"
134-
to="https://$1.aldi-suisse.ch/"/>
135-
<rule from="^http://(?:www\.)?alditalk\.de/"
130+
<rule from="^http://alditalk\.de/"
136131
to="https://www.alditalk.de/"/>
137-
<rule from="^http://([^/:@]*)\.alditalk\.de/"
138-
to="https://$1.alditalk.de/"/>
139-
<rule from="^http://(?:www\.)?hofer\.at/"
132+
<rule from="^http://hofer\.at/"
140133
to="https://www.hofer.at/"/>
141-
<rule from="^http://([^/:@]*)\.hofer\.at/"
142-
to="https://$1.hofer.at/"/>
143-
<rule from="^http://(?:www\.)?hofer\.si/"
144-
to="https://www.hofer.si/"/>
145-
<rule from="^http://([^/:@]*)\.hofer\.si/"
146-
to="https://$1.hofer.si/"/>
134+
<rule from="^http://vinothek\.hofer\.at/"
135+
to="https://www.vinothek.hofer.at/"/>
136+
<rule from="^http://vinoteka\.hofer\.si/"
137+
to="https://www.vinoteka.hofer.si/"/>
138+
<rule from="^http:"
139+
to="https:"/>
147140
</ruleset>

‎src/chrome/content/rules/Abbo-Shop.xml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://abbo-shop.ch/ => https://www.abbo-shop.ch/: Cycle detected - URL already encountered: https://www.abbo-shop.ch/
4-
Fetch error: http://www.abbo-shop.ch/ => https://www.abbo-shop.ch/: Cycle detected - URL already encountered: https://www.abbo-shop.ch/
5-
-->
6-
<ruleset name="Abbo-shop.ch" default_off='failed ruleset test'>
7-
<target host="abbo-shop.ch" />
8-
<target host="www.abbo-shop.ch" />
9-
<securecookie host="^(?:.*\.)?abbo-shop\.ch$" name=".*" />
1+
<ruleset name="Abbo-shop.ch" default_off='redirect to http'>
2+
<target host="abbo-shop.ch" />
3+
<target host="www.abbo-shop.ch" />
104

11-
<rule from="^http://(?:www\.)?abbo-shop\.ch/" to="https://www.abbo-shop.ch/"/>
12-
</ruleset>
5+
<securecookie host="^(?:.*\.)?abbo-shop\.ch$" name=".*" />
136

7+
<rule from="^http:"
8+
to="https:" />
9+
</ruleset>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<ruleset name="Absolute Software">
2+
3+
<target host="absolute.com" />
4+
<target host="www.absolute.com" />
5+
<target host="forums.absolute.com" />
6+
<target host="my.absolute.com" />
7+
8+
<securecookie host=".+" name=".+" />
9+
10+
<rule from="^http:"
11+
to="https:" />
12+
13+
</ruleset>

‎src/chrome/content/rules/Agar.io.xml‎

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

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

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,40 @@
1515
1616
Nonfunctional subdomains:
1717
18-
- gd[1-4] ¹
19-
- gju1 ¹
20-
- gqrcode ¹
21-
- gtms0[1-4] *
22-
- gw[123] ¹
18+
- f0[1-3].s
2319
- gi3.md ¹
2420
- g.search ¹
2521
- g.search[123] ¹
2622
2723
* 504, akamai
28-
29-
30-
Fully covered subdomains:
31-
32-
- at
33-
- g
34-
3524
-->
3625
<ruleset name="AliCDN.com (partial)">
37-
38-
<target host="*.alicdn.com" />
39-
40-
41-
<rule from="^http://(at|g)\.alicdn\.com/"
42-
to="https://$1.alicdn.com/" />
43-
26+
<target host="assets.alicdn.com" />
27+
<target host="atbk.alicdn.com" />
28+
<target host="atp.alicdn.com" />
29+
<target host="at.alicdn.com" />
30+
<target host="g.alicdn.com" />
31+
<target host="gd1.alicdn.com" />
32+
<target host="gd2.alicdn.com" />
33+
<target host="gd3.alicdn.com" />
34+
<target host="gd4.alicdn.com" />
35+
<target host="gju1.alicdn.com" />
36+
<target host="gju2.alicdn.com" />
37+
<target host="gju3.alicdn.com" />
38+
<target host="gju4.alicdn.com" />
39+
<target host="gtms01.alicdn.com" />
40+
<target host="gtms02.alicdn.com" />
41+
<target host="gtms03.alicdn.com" />
42+
<target host="gtms04.alicdn.com" />
43+
<target host="gtd.alicdn.com" />
44+
<target host="gw1.alicdn.com" />
45+
<target host="gw2.alicdn.com" />
46+
<target host="gw3.alicdn.com" />
47+
<target host="img.alicdn.com" />
48+
<target host="m.alicdn.com" />
49+
<target host="osdsc.alicdn.com" />
50+
<target host="tms.alicdn.com" />
51+
52+
<rule from="^http:"
53+
to="https:" />
4454
</ruleset>

0 commit comments

Comments
 (0)