Skip to content

Commit b679127

Browse files
committed
Merge pull request EFForg#2368 from J0WI/Thalia
[Thalia]
2 parents 5651aff + d1f0bef commit b679127

File tree

2 files changed

+81
-7
lines changed

2 files changed

+81
-7
lines changed
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<!--
2+
Missmatch:
3+
- images.bol.de *
4+
- images.buch.de *
5+
- images.thalia.de *
6+
- media.buch.de *
7+
8+
* Rewrite to www.buch.de fails sometimes:
9+
10+
Refused:
11+
- blog.buch.de
12+
- unternehmen.thalia.de
13+
- ^buch.de
14+
15+
16+
Wrong content:
17+
- ^thalia.ch
18+
19+
Mixed content:
20+
- various images served from images.*
21+
-->
22+
<ruleset name="Thalia Holding" platform="mixedcontent">
23+
<target host="bol.de"/>
24+
<target host="www.bol.de"/>
25+
<target host="img.bol.de"/>
26+
<target host="books.ch"/>
27+
<target host="www.books.ch"/>
28+
<target host="img.books.ch"/>
29+
<target host="buch.ch"/>
30+
<target host="www.buch.ch"/>
31+
<target host="img.buch.ch"/>
32+
<target host="buch.de"/>
33+
<target host="www.buch.de"/>
34+
<target host="img.buch.de"/>
35+
<target host="leseprobe.buch.de"/>
36+
<target host="ssl.buch.de"/>
37+
<target host="thalia.at"/>
38+
<target host="www.thalia.at"/>
39+
<target host="img.thalia.at"/>
40+
<target host="thalia.ch"/>
41+
<target host="www.thalia.ch"/>
42+
<target host="img.thalia.ch"/>
43+
<target host="thalia.de"/>
44+
<target host="www.thalia.de"/>
45+
<target host="img.thalia.de"/>
46+
47+
<!--
48+
Trying to rewrite mismatched domains to buch.de, but this
49+
fails for some images. Commented out for future work.
50+
51+
<target host="images.bol.de"/>
52+
<target host="images.buch.de"/>
53+
<target host="images.thalia.de"/>
54+
<target host="media.buch.de"/>
55+
<exclusion pattern="^http://media\.buch\.de/alexandria/"/>
56+
<exclusion pattern="^http://images\.buch\.de/leseproben/"/>
57+
<exclusion pattern="^http://images\.buch\.de/md21/"/>
58+
<exclusion pattern="^http://images\.thalia\.de/md37/"/>
59+
60+
<test url="http://media.buch.de/alexandria/thalia_test/000008951137-00-1.jpg"/>
61+
<test url="http://images.buch.de/leseproben/874/541/12_9783442541874.pdf"/>
62+
<test url="http://images.buch.de/md21/Pix2015/Portalseite/miles-and-more-logo-startseite.png"/>
63+
<test url="http://images.thalia.de/md37/lp2015/Sommer/sommer_stempel_thalia_10.png"/>
64+
65+
<rule from="^http://images\.bol\.de/"
66+
to="https://www.bol.de/"/>
67+
<rule from="^http://images\.buch\.de/"
68+
to="https://www.buch.de/"/>
69+
<rule from="^http://media\.buch\.de/"
70+
to="https://www.buch.de/"/>
71+
<rule from="^http://images\.thalia\.de/"
72+
to="https://www.buch.de/"/>
73+
-->
74+
75+
<rule from="^http://buch\.de/"
76+
to="https://www.buch.de/"/>
77+
<rule from="^http://thalia\.ch/"
78+
to="https://www.thalia.ch/"/>
79+
<rule from="^http:"
80+
to="https:"/>
81+
</ruleset>

src/chrome/content/rules/buch.ch.xml

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

0 commit comments

Comments
 (0)