Skip to content

Commit b46416a

Browse files
committed
Merge remote-tracking branch 'negres/master'
2 parents dc50dde + 69a201d commit b46416a

5 files changed

Lines changed: 72 additions & 1 deletion

File tree

‎src/chrome/content/rules/4DO.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<ruleset name="4DO" default_off="mismatch">
2+
3+
<!-- Cert: *.ipage.com -->
4+
<target host="fourdo.com" />
5+
<target host="*.fourdo.com" />
6+
7+
8+
<securecookie host="^.*\.fourdo\.com$" name=".*" />
9+
10+
11+
<!-- !www redirects to www. -->
12+
<rule from="^https?://(?:www\.)?fourdo\.com/"
13+
to="https://www.fourdo.com/" />
14+
15+
<rule from="^http://(forum|wiki)\.fourdo\.com/"
16+
to="https://$1.fourdo.com/" />
17+
18+
</ruleset>

‎src/chrome/content/rules/Conde-Nast.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<target host="arstechnica.com" />
4141
<target host="*.arstechnica.com" />
4242
<!-- Handled in -mismatches. -->
43-
<exclusion pattern="^https?://cdn\.arstechnica\.net/wp-(content|uploads)/" />
43+
<exclusion pattern="^https?://cdn\.arstechnica\.com/wp-(content|uploads)/" />
4444
<target host="*.arstechnica.net" />
4545
<target host="condenaststore.com" />
4646
<target host="www.condenaststore.com" />
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<ruleset name="EnmuNewz Network" default_off="mismatch">
2+
3+
<!-- Cert: www.codebackbone.com -->
4+
<target host="arcadeflex.com" />
5+
<target host="www.arcadeflex.com" />
6+
<target host="emunewz.net" />
7+
<target host="www.emunewz.net" />
8+
<!-- * for cross-domain cookies. -->
9+
<target host="*.www.emunews.net" />
10+
<target host="jpcsp.org" />
11+
<target host="www.jpcsp.org" />
12+
<target host="pcsp-emu.com" />
13+
<target host="www.pcsp-emu.com" />
14+
<target host="pspudb.com" />
15+
<!-- Ditto -->
16+
<target host="*.pspudb.com" />
17+
<target host="yaupspe.com" />
18+
<target host="www.yaupspe.com" />
19+
20+
21+
<securecookie host="^.*\.emunews\.net$" name=".*" />
22+
<securecookie host="^.*\.p(csp-emu|spudb)\.com$" name=".*" />
23+
24+
25+
<rule from="^https?://(?:www\.)?(arcadeflex|pcsp-emu|pspudb|yaupspe)\.com/"
26+
to="https://$1.com/" />
27+
28+
<rule from="^https?://(?:www\.)?emunewz\.net/"
29+
to="https://emunewz.net/" />
30+
31+
<rule from="^https?://(?:www\.)?jpcsp\.org/"
32+
to="https://jpcsp.org/" />
33+
34+
</ruleset>

‎src/chrome/content/rules/Hewlett-Packard.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<!--
2+
Nonfunctional:
3+
4+
- h10060.www1 (cert doesn't match; 404)
5+
6+
-->
17
<ruleset name="Hewlett-Packard Company (partial)">
28

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

0 commit comments

Comments
 (0)