Skip to content

Commit 6908d59

Browse files
committed
Merge pull request EFForg#1098 from jsha/fix-mysql
Fix MySQL rule.
2 parents 113648d + f54179c commit 6908d59

2 files changed

Lines changed: 16 additions & 28 deletions

File tree

src/chrome/content/rules/MySQL.xml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
Problematic subdomains:
1313
1414
- cdn (akamai)
15+
cdn
16+
downloads
17+
forge
18+
lists
19+
planet
20+
wb
21+
forums
22+
labs
1523
1624
1725
Nonfunctional subdomains:
@@ -24,17 +32,10 @@
2432
<ruleset name="MySQL">
2533

2634
<target host="mysql.com"/>
27-
<target host="*.mysql.com"/>
28-
<!-- forums works but is a cert mismatch -->
29-
<exclusion pattern="^http://(?:cdn|downloads|forge|lists|planet|wb|forums|labs)\.mysql\.com/"/>
30-
<test url="http://cdn.mysql.com/"/>
31-
<test url="http://downloads.mysql.com/"/>
32-
<test url="http://forge.mysql.com/"/>
33-
<test url="http://lists.mysql.com/"/>
34-
<test url="http://planet.mysql.com/"/>
35-
<test url="http://wb.mysql.com/"/>
36-
<test url="http://forums.mysql.com/"/>
37-
<test url="http://labs.mysql.com/"/>
35+
<target host="dev.mysql.com"/>
36+
<target host="www-jp.mysql.com"/>
37+
<target host="repo.mysql.com"/>
38+
<target host="bugs.mysql.com"/>
3839
<target host="mysql.de"/>
3940
<target host="www.mysql.de"/>
4041
<target host="mysql.fr"/>
@@ -58,16 +59,11 @@
5859
-->
5960
<securecookie host="^\.mysql\.\w{2,3}$" name="^MySQL_S$"/>
6061

61-
62-
63-
<rule from="^http://([^/:@\.]+\.)?mysql\.com/"
64-
to="https://$1mysql.com/"/>
65-
<test url="http://foo.mysql.com/"/>
66-
<test url="http://bar.mysql.com/"/>
67-
<test url="http://baz.mysql.com/"/>
68-
6962
<!-- Cert doesn't match !www -->
70-
<rule from="^http://(?:www\.)?mysql\.(\w\w)/"
63+
<rule from="^http://mysql\.(\w\w)/"
7164
to="https://www.mysql.$1/"/>
7265

66+
<rule from="^http:"
67+
to="https:" />
68+
7369
</ruleset>

src/chrome/content/rules/Oracle-mismatches.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@
44
-->
55
<ruleset name="Oracle (mismatches)" default_off="mismatch">
66

7-
<!-- Cert: www.mysql.com -->
8-
<target host="bugs.mysql.com" />
9-
<target host="downloads.mysql.com" />
10-
<target host="forge.mysql.com" />
11-
<target host="forums.mysql.com" />
12-
<target host="labs.mysql.com" />
13-
<target host="lists.mysql.com" />
14-
<target host="planet.mysql.com" />
157
<!-- Akamai -->
168
<target host="events.oracle.com" />
179
<!-- cert: forums.netbeans.org -->

0 commit comments

Comments
 (0)