Skip to content

Commit 665a373

Browse files
committed
Merge pull request EFForg#2372 from J0WI/patch-9
fix EFForg#2318
2 parents df2e379 + 68c6ca5 commit 665a373

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
<!--
22
CDN buckets:
3-
43
- s3.amazonaws.com/files.enjin.com/
54
65
- d2umfjgc9kwn9b.cloudfront.net
76
- assets-cloud.enjin.com
8-
97
-->
10-
<ruleset name="Enjin">
11-
8+
<ruleset name="Enjin" platform="mixedcontent">
129
<target host="enjin.com" />
1310
<target host="*.enjin.com" />
14-
<target host="*.www.enjin.com" />
1511
<target host="resources.guild-hosting.net" />
16-
12+
13+
<test url="http://www.enjin.com/" />
14+
<test url="http://assets-cloud.enjin.com/" />
15+
<test url="http://support.enjin.com/" />
16+
<test url="http://files.enjin.com/" />
17+
<test url="http://townywarriorsmc.enjin.com/" />
18+
<test url="http://www.townywarriorsmc.enjin.com/" />
19+
<test url="http://dracokraft.enjin.com/" />
20+
<test url="http://www.dracokraft.enjin.com/" />
1721

1822
<!-- Guild subdomains set wildcard cookies. In
1923
order to secure them, we'd have to target
2024
each and every guild's subdomain...
2125
-->
2226
<securecookie host="^(?:.*\.)?enjin\.com$" name=".+" />
2327

24-
2528
<rule from="^http://assets-cloud\.enjin\.com/"
2629
to="https://d2umfjgc9kwn9b.cloudfront.net/" />
2730

@@ -30,12 +33,11 @@
3033

3134
<!-- Guilds have unique subdomains.
3235
-->
33-
<rule from="^http://([\w\-]+\.)?enjin\.com/"
34-
to="https://$1enjin.com/" />
36+
<rule from="^http://(www\.)?([\w-]+\.)?enjin\.com/"
37+
to="https://$2enjin.com/" />
3538

3639
<!-- CN: *.enjin.com
3740
-->
3841
<rule from="^http://resources\.guild-hosting\.net/"
3942
to="https://resources.enjin.com/" />
40-
4143
</ruleset>

0 commit comments

Comments
 (0)