Skip to content

Commit 0d79007

Browse files
tlseverywherepde
tlseverywhere
authored and
pde
committed
Fixes: PassThePopcorn, Priform, WhatCD, Kirjoitusalusta.fi
https://mail1.eff.org/pipermail/https-everywhere-rules/2012-September/001293.html Conflicts: src/chrome/content/rules/Piriform.xml src/chrome/content/rules/WhatCD.xml src/chrome/content/rules/kirjoitusalusta.fi.xml
1 parent 384548b commit 0d79007

File tree

4 files changed

+30
-4
lines changed

4 files changed

+30
-4
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<ruleset name="PassThePopcorn">
2-
<target host="passthepopcorn.me" />
2+
<target host="passthepopcorn.me" />
3+
<target host="www.passthepopcorn.me" />
4+
<target host="static.passthepopcorn.me" />
5+
<target host="tls.passthepopcorn.me" />
36

4-
<rule from="^http://passthepopcorn\.me/" to="https://passthepopcorn.me/"/>
5-
</ruleset>
7+
<rule from="^http://(www\.)?passthepopcorn\.me/" to="https://tls.passthepopcorn.me/"/>
8+
<rule from="^http://(static|tls)\.passthepopcorn\.me/" to="https://$1.passthepopcorn.me/"/>
9+
</ruleset>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<ruleset name="Piriform (partial)">
2+
3+
<target host="static.piriform.com"/>
4+
<target host="www.piriform.com"/>
5+
<target host="piriform.com"/>
6+
<target host="secure.piriform.com"/>
7+
8+
<rule from="^https://piriform\.com/" to="https://www.piriform.com/"/>
9+
<rule from="^http://(www\.)?piriform\.com/" to="https://www.piriform.com/"/>
10+
<rule from="^http://secure\.piriform\.com/" to="https://secure.piriform.com/"/>
11+
<rule from="^http://static\.piriform\.com/" to="https://s3.amazonaws.com/static.piriform.com/"/>
12+
</ruleset>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<ruleset name="WhatCD">
22
<target host="what.cd" />
33
<target host="www.what.cd" />
4+
<target host="m.what.cd" />
5+
<target host="ssl.what.cd" />
46

5-
<rule from="^http://(?:www\.)?what\.cd/$" to="https://ssl.what.cd/"/>
7+
<rule from="^http://(www\.)?what\.cd/" to="https://what.cd/"/>
8+
<rule from="^http://(m|ssl)\.what\.cd/" to="https://$1.what.cd/"/>
69

710
</ruleset>

‎src/chrome/content/rules/kirjoitusalusta.fi.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<ruleset name="Kirjoitusalusta">
2+
<target host="*.kirjoitusalusta.fi" />
3+
<target host="kirjoitusalusta.fi" />
4+
5+
<rule from="^http://kirjoitusalusta\.fi/" to="https://kirjoitusalusta.fi/"/>
6+
<rule from="^http://([^/:@]*)\.kirjoitusalusta\.fi/" to="https://$1.kirjoitusalusta.fi/"/>
7+
</ruleset>

0 commit comments

Comments
 (0)