summaryrefslogtreecommitdiffstats
path: root/net/base/effective_tld_names.dat
diff options
context:
space:
mode:
authorpamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-24 00:54:57 +0000
committerpamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-24 00:54:57 +0000
commitaf3b384ee7cf50c07c7efd43205f044bdc6faa1c (patch)
tree3d19f01f1c14424087f2c551aa51e909982a46e3 /net/base/effective_tld_names.dat
parentb6593e3d550dc15f9fd12d7fd92b9b0251bd63e0 (diff)
downloadchromium_src-af3b384ee7cf50c07c7efd43205f044bdc6faa1c.zip
chromium_src-af3b384ee7cf50c07c7efd43205f044bdc6faa1c.tar.gz
chromium_src-af3b384ee7cf50c07c7efd43205f044bdc6faa1c.tar.bz2
Pull in latest file from Mozilla.
BUG=b/1305245 TEST=none Review URL: http://codereview.chromium.org/8132 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/effective_tld_names.dat')
-rw-r--r--net/base/effective_tld_names.dat42
1 files changed, 34 insertions, 8 deletions
diff --git a/net/base/effective_tld_names.dat b/net/base/effective_tld_names.dat
index b58e2a9..ddde65f 100644
--- a/net/base/effective_tld_names.dat
+++ b/net/base/effective_tld_names.dat
@@ -39,7 +39,7 @@
//
// ***** END LICENSE BLOCK *****
-// Chromium note: this is Mozilla's revision 18744:a1d3449a2cba of this file.
+// Chromium note: this is Mozilla's revision 20597:6ecaa44f559e of this file.
// ac : http://en.wikipedia.org/wiki/.ac
ac
@@ -873,8 +873,16 @@ net.gg
sch.gg
gov.gg
-// gh : http://www.ghana.com/domain.htm
-*.gh
+// gh : http://en.wikipedia.org/wiki/.gh
+// see also: http://www.nic.gh/reg_now.php
+// Although domains directly at second level are not possible at the moment,
+// they have been possible for some time and may come back.
+gh
+com.gh
+edu.gh
+gov.gh
+org.gh
+mil.gh
// gi : http://www.nic.gi/rules.html
gi
@@ -1381,7 +1389,6 @@ sch.jo
gov.jo
mil.jo
name.jo
-myname.jo
// jobs : http://en.wikipedia.org/wiki/.jobs
jobs
@@ -1622,6 +1629,7 @@ org.ky
net.ky
// kz : http://en.wikipedia.org/wiki/.kz
+// see also: http://www.nic.kz/rules/index.jsp
kz
org.kz
edu.kz
@@ -2412,7 +2420,14 @@ edu.mx
net.mx
// my : http://www.mynic.net.my/
-*.my
+my
+com.my
+net.my
+org.my
+gov.my
+edu.my
+mil.my
+name.my
// mz : http://www.gobin.info/domainname/mz-template.doc
*.mz
@@ -3358,7 +3373,6 @@ gok.pk
gon.pk
gop.pk
gos.pk
-goa.pk
info.pk
// pl : http://www.dns.pl/english/
@@ -3836,6 +3850,7 @@ info.sd
// se : http://en.wikipedia.org/wiki/.se
// Submitted by registry <Patrik.Wallstrom@iis.se> 2008-06-24
+se
a.se
ac.se
b.se
@@ -3938,8 +3953,15 @@ su
// sv : http://www.svnet.org.sv/svpolicy.html
*.sv
-// sy : http://www.gobin.info/domainname/sy.doc
-*.sy
+// sy : http://en.wikipedia.org/wiki/.sy
+// see also: http://www.gobin.info/domainname/sy.doc
+sy
+edu.sy
+gov.sy
+net.sy
+mil.sy
+com.sy
+org.sy
// sz : http://en.wikipedia.org/wiki/.sz
// http://www.sispa.org.sz/
@@ -3954,6 +3976,10 @@ tc
// td : http://en.wikipedia.org/wiki/.td
td
+// tel: http://en.wikipedia.org/wiki/.tel
+// http://www.telnic.org/
+tel
+
// tf : http://en.wikipedia.org/wiki/.tf
tf