Skip to content

Commit 9559a08

Browse files
J0WIgloomy-ghost
J0WI
authored and
gloomy-ghost
committed
re-enable and split Blick rulesets (EFForg#12511)
* re-enable and split Blick rulesets * remove obsolete target
1 parent e1a40a6 commit 9559a08

2 files changed

Lines changed: 24 additions & 54 deletions

File tree

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

Lines changed: 11 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,24 @@
1-
21
<!--
3-
Disabled by https-everywhere-checker because:
4-
Fetch error: http://video.blick.ch/ => https://video.blick.ch/: (6, 'Could not resolve host: video.blick.ch')
2+
Other Blick rulesets:
3+
- Blickamabend.ch.xml
54
65
Mismatch:
7-
- rp.blick.ch
8-
9-
Refused:
10-
- gutscheine.blick.ch
11-
12-
Mixed content:
13-
- app.blickamabend.ch
14-
15-
Timeout:
16-
- php.blick.ch
17-
18-
Redirect:
19-
- (www\.)?blick.ch
20-
- (www\.)?blickamabend.ch
21-
- amp.blickamabend.ch
22-
23-
24-
Static content from these URLs work, but as an alias for ^(www.) they have mixed content issues:
25-
- f[1-3]?\.blick\.ch
26-
- f.blickamabend.ch
6+
- rp.blick.ch
277
-->
28-
<ruleset name="blick.ch (partial)" default_off='failed ruleset test'>
8+
<ruleset name="blick.ch">
9+
<target host="blick.ch"/>
10+
<target host="www.blick.ch"/>
2911
<target host="c.blick.ch"/>
3012
<target host="ebalance.blick.ch"/>
3113
<target host="f.blick.ch"/>
3214
<target host="f1.blick.ch"/>
3315
<target host="f2.blick.ch"/>
3416
<target host="f3.blick.ch"/>
17+
<target host="gutscheine.blick.ch"/>
3518
<target host="parship.blick.ch"/>
36-
<target host="video.blick.ch"/>
37-
38-
<target host="f.blickamabend.ch"/>
39-
40-
41-
<test url="http://f.blickamabend.ch/resources/BAAZ_20160916-1/ver1-0/img/Logo_BlickamAbend.svg" />
42-
<test url="http://f.blick.ch/resources/BAAZ_20160916-1/ver1-0/img/Logo_BlickamAbend.svg" />
43-
<test url="http://f1.blick.ch/resources/BAAZ_20160916-1/ver1-0/img/Logo_BlickamAbend.svg" />
44-
<test url="http://f2.blick.ch/resources/BAAZ_20160916-1/ver1-0/img/Logo_BlickamAbend.svg" />
45-
<test url="http://f3.blick.ch/resources/BAAZ_20160916-1/ver1-0/img/Logo_BlickamAbend.svg" />
46-
<test url="http://f.blickamabend.ch/img/nativeads/crop3597253/882668537-csquare-w50-q99/wysiwyg-logo.png" />
47-
<test url="http://f.blick.ch/img/nativeads/crop3597253/882668537-csquare-w50-q99/wysiwyg-logo.png" />
48-
<test url="http://f1.blick.ch/img/nativeads/crop3597253/882668537-csquare-w50-q99/wysiwyg-logo.png" />
49-
<test url="http://f2.blick.ch/img/nativeads/crop3597253/882668537-csquare-w50-q99/wysiwyg-logo.png" />
50-
<test url="http://f3.blick.ch/img/nativeads/crop3597253/882668537-csquare-w50-q99/wysiwyg-logo.png" />
51-
52-
53-
<rule from="^http://(c|ebalance|parship|video)\.blick\.ch/"
54-
to="https://$1.blick.ch/"/>
55-
56-
57-
<exclusion pattern="^http://f.blick.ch/$" />
58-
<exclusion pattern="^http://f1.blick.ch/$" />
59-
<exclusion pattern="^http://f2.blick.ch/$" />
60-
<exclusion pattern="^http://f3.blick.ch/$" />
61-
<exclusion pattern="^http://f.blickamabend.ch/$" />
19+
<target host="php.blick.ch"/>
20+
<test url="http://php.blick.ch/red/WhatsAppBLICK.vcf"/>
6221

63-
<rule from="^http://(f[1-3]?)\.blick\.ch/(img|resources)/"
64-
to="https://$1.blick.ch/$2/"/>
65-
<rule from="^http://f\.blickamabend\.ch/(img|resources)/"
66-
to="https://f.blickamabend.ch/$1/"/>
22+
<rule from="^http:"
23+
to="https:"/>
6724
</ruleset>

‎src/chrome/content/rules/Blickamabend.ch.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!--
2+
For other Blick coverage, see Blick.xml.
3+
-->
4+
<ruleset name="blickamabend.ch">
5+
<target host="blickamabend.ch"/>
6+
<target host="www.blickamabend.ch"/>
7+
<target host="amp.blickamabend.ch"/>
8+
<target host="app.blickamabend.ch"/>
9+
<target host="f.blickamabend.ch"/>
10+
11+
<rule from="^http:"
12+
to="https:"/>
13+
</ruleset>

0 commit comments

Comments
 (0)