summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/base/effective_tld_names.cc43
-rw-r--r--net/base/effective_tld_names.dat124
2 files changed, 90 insertions, 77 deletions
diff --git a/net/base/effective_tld_names.cc b/net/base/effective_tld_names.cc
index eb6ff32..930d0b5 100644
--- a/net/base/effective_tld_names.cc
+++ b/net/base/effective_tld_names.cc
@@ -18,6 +18,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"!city.kyoto.jp\n"
"!city.nagoya.jp\n"
"!city.niigata.jp\n"
+ "!city.okayama.jp\n"
"!city.osaka.jp\n"
"!city.saitama.jp\n"
"!city.sapporo.jp\n"
@@ -31,15 +32,12 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"!jet.uk\n"
"!mecon.ar\n"
"!metro.tokyo.jp\n"
- "!milpolleras.pa\n"
"!nacion.ar\n"
"!national-library-scotland.uk\n"
"!nel.uk\n"
"!nhs.uk\n"
"!nic.ar\n"
- "!nic.pa\n"
"!nls.uk\n"
- "!pannet.pa\n"
"!parliament.uk\n"
"!pref.aichi.jp\n"
"!pref.akita.jp\n"
@@ -87,11 +85,8 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"!pref.yamagata.jp\n"
"!pref.yamaguchi.jp\n"
"!pref.yamanashi.jp\n"
- "!presidencia.pa\n"
"!promocion.ar\n"
"!retina.ar\n"
- "!root-ca.pa\n"
- "!sume911.pa\n"
"!uba.ar\n"
"*.aichi.jp\n"
"*.akita.jp\n"
@@ -160,11 +155,9 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"*.okinawa.jp\n"
"*.om\n"
"*.osaka.jp\n"
- "*.pa\n"
"*.pg\n"
"*.py\n"
"*.qa\n"
- "*.sa\n"
"*.saga.jp\n"
"*.saitama.jp\n"
"*.sapporo.jp\n"
@@ -210,6 +203,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"aa.no\n"
"aarborte.no\n"
"ab.ca\n"
+ "abo.pa\n"
"ac\n"
"ac.ae\n"
"ac.at\n"
@@ -228,6 +222,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"ac.mu\n"
"ac.mw\n"
"ac.ng\n"
+ "ac.pa\n"
"ac.pr\n"
"ac.rs\n"
"ac.ru\n"
@@ -733,6 +728,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"co.ug\n"
"co.us\n"
"co.uz\n"
+ "co.vi\n"
"coal.museum\n"
"coastaldefence.museum\n"
"cody.museum\n"
@@ -783,6 +779,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"com.hr\n"
"com.ht\n"
"com.io\n"
+ "com.iq\n"
"com.is\n"
"com.jo\n"
"com.kg\n"
@@ -808,6 +805,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"com.nf\n"
"com.ng\n"
"com.nr\n"
+ "com.pa\n"
"com.pe\n"
"com.pf\n"
"com.ph\n"
@@ -820,6 +818,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"com.ro\n"
"com.ru\n"
"com.rw\n"
+ "com.sa\n"
"com.sb\n"
"com.sc\n"
"com.sd\n"
@@ -1025,6 +1024,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"edu.my\n"
"edu.ng\n"
"edu.nr\n"
+ "edu.pa\n"
"edu.pe\n"
"edu.pf\n"
"edu.ph\n"
@@ -1035,7 +1035,9 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"edu.ps\n"
"edu.pt\n"
"edu.rs\n"
+ "edu.ru\n"
"edu.rw\n"
+ "edu.sa\n"
"edu.sb\n"
"edu.sc\n"
"edu.sd\n"
@@ -1049,7 +1051,6 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"edu.tw\n"
"edu.ua\n"
"edu.vc\n"
- "edu.vi\n"
"edu.vn\n"
"edu.ws\n"
"education.museum\n"
@@ -1305,6 +1306,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"gob.es\n"
"gob.hn\n"
"gob.mx\n"
+ "gob.pa\n"
"gob.pe\n"
"gob.pk\n"
"gok.pk\n"
@@ -1397,7 +1399,9 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"gov.ps\n"
"gov.pt\n"
"gov.rs\n"
+ "gov.ru\n"
"gov.rw\n"
+ "gov.sa\n"
"gov.sb\n"
"gov.sc\n"
"gov.sd\n"
@@ -1414,7 +1418,6 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"gov.tw\n"
"gov.ua\n"
"gov.vc\n"
- "gov.vi\n"
"gov.vn\n"
"gov.ws\n"
"government.aero\n"
@@ -1630,6 +1633,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"info.tn\n"
"info.tt\n"
"info.vn\n"
+ "ing.pa\n"
"ingatlan.hu\n"
"insurance.aero\n"
"int\n"
@@ -1721,6 +1725,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"k.bg\n"
"k.se\n"
"k12.ec\n"
+ "k12.vi\n"
"kafjord.no\n"
"kalisz.pl\n"
"kalmykia.ru\n"
@@ -1893,6 +1898,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"ln.cn\n"
"lo.it\n"
"loabat.no\n"
+ "local\n"
"localhistory.museum\n"
"lodi.it\n"
"lodingen.no\n"
@@ -1992,8 +1998,10 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"med.ee\n"
"med.ht\n"
"med.ly\n"
+ "med.pa\n"
"med.pl\n"
"med.pro\n"
+ "med.sa\n"
"med.sd\n"
"medecin.fr\n"
"medecin.km\n"
@@ -2040,6 +2048,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"mil.gh\n"
"mil.hn\n"
"mil.in\n"
+ "mil.iq\n"
"mil.jo\n"
"mil.kg\n"
"mil.km\n"
@@ -2052,6 +2061,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"mil.pe\n"
"mil.ph\n"
"mil.pl\n"
+ "mil.ru\n"
"mil.rw\n"
"mil.st\n"
"mil.sy\n"
@@ -2242,6 +2252,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"net.ht\n"
"net.im\n"
"net.in\n"
+ "net.iq\n"
"net.ir\n"
"net.is\n"
"net.je\n"
@@ -2269,6 +2280,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"net.nf\n"
"net.ng\n"
"net.nr\n"
+ "net.pa\n"
"net.pe\n"
"net.ph\n"
"net.pk\n"
@@ -2279,6 +2291,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"net.pt\n"
"net.ru\n"
"net.rw\n"
+ "net.sa\n"
"net.sb\n"
"net.sc\n"
"net.sd\n"
@@ -2295,6 +2308,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"net.tw\n"
"net.ua\n"
"net.vc\n"
+ "net.vi\n"
"net.vn\n"
"net.ws\n"
"neues.museum\n"
@@ -2339,6 +2353,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"nom.fr\n"
"nom.km\n"
"nom.mg\n"
+ "nom.pa\n"
"nom.pe\n"
"nom.pl\n"
"nom.re\n"
@@ -2479,6 +2494,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"org.hu\n"
"org.im\n"
"org.in\n"
+ "org.iq\n"
"org.ir\n"
"org.is\n"
"org.je\n"
@@ -2510,6 +2526,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"org.na\n"
"org.ng\n"
"org.nr\n"
+ "org.pa\n"
"org.pe\n"
"org.pf\n"
"org.ph\n"
@@ -2522,6 +2539,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"org.ro\n"
"org.rs\n"
"org.ru\n"
+ "org.sa\n"
"org.sb\n"
"org.sc\n"
"org.sd\n"
@@ -2717,6 +2735,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"pt.it\n"
"ptz.ru\n"
"pu.it\n"
+ "pub.sa\n"
"publ.pt\n"
"public.museum\n"
"pubol.museum\n"
@@ -2889,6 +2908,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"sch.jo\n"
"sch.lk\n"
"sch.ly\n"
+ "sch.sa\n"
"schlesisches.museum\n"
"schoenbrunn.museum\n"
"schokoladen.museum\n"
@@ -2969,6 +2989,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"sl\n"
"slask.pl\n"
"slattum.no\n"
+ "sld.pa\n"
"slg.br\n"
"slupsk.pl\n"
"sm\n"
@@ -3102,7 +3123,6 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"t.bg\n"
"t.se\n"
"ta.it\n"
- "tagil.ru\n"
"tambov.ru\n"
"tana.no\n"
"tananger.no\n"
@@ -3126,6 +3146,7 @@ const char net::RegistryControlledDomainService::kDomainData[] =
"teramo.it\n"
"terni.it\n"
"ternopil.ua\n"
+ "test.ru\n"
"texas.museum\n"
"textile.museum\n"
"tf\n"
diff --git a/net/base/effective_tld_names.dat b/net/base/effective_tld_names.dat
index 4728a82..f5e84a9 100644
--- a/net/base/effective_tld_names.dat
+++ b/net/base/effective_tld_names.dat
@@ -684,7 +684,7 @@ za.com
// coop : http://en.wikipedia.org/wiki/.coop
coop
-// cr : http://en.wikipedia.org/wiki/.cr
+// cr : http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
cr
ac.cr
co.cr
@@ -1110,11 +1110,14 @@ eu.int
io
com.io
-// iq : http://en.wikipedia.org/wiki/.iq
-// no registrar website found, but google shows .gov.iq and .edu.iq websites
+// iq : http://www.cmc.iq/english/iq/iqregister1.htm
iq
gov.iq
edu.iq
+mil.iq
+com.iq
+org.iq
+net.iq
// ir : http://www.nic.ir/ascii/Appendix1.htm
ir
@@ -1404,6 +1407,7 @@ jobs
// jp : http://en.wikipedia.org/wiki/.jp
// http://jprs.co.jp/en/jpdomain.html
// Submitted by registry <yone@jprs.co.jp> 2008-06-11
+// Updated by registry <yone@jprs.co.jp> 2008-12-04
jp
// jp organizational type names
ac.jp
@@ -1527,6 +1531,7 @@ or.jp
!city.kyoto.jp
!city.nagoya.jp
!city.niigata.jp
+!city.okayama.jp
!city.osaka.jp
!city.saitama.jp
!city.sapporo.jp
@@ -1698,6 +1703,9 @@ assn.lk
grp.lk
hotel.lk
+// local : http://en.wikipedia.org/wiki/.local
+local
+
// lr : http://psg.com/dns/lr/lr.txt
// Submitted by registry <randy@psg.com> 2008-06-17
com.lr
@@ -3307,33 +3315,20 @@ org
ae.org
// pa : http://www.nic.pa/
-// List with redundant entries as submitted by registry <edna.samudio@utp.ac.pa> 2008-06-18
-//*.pa
-//!nic.pa
-//!pannet.pa
-//!presidencia.pa
-//!milpolleras.pa
-//!sume911.pa
-//!root-ca.pa
-//ac.pa
-//gob.pa
-//com.pa
-//org.pa
-//sld.pa
-//edu.pa
-//net.pa
-//ing.pa
-//abo.pa
-//med.pa
-//nom.pa
-// As discussed in bug #447815 on bugzilla.mozilla.org, the list has been truncated.
-*.pa
-!nic.pa
-!pannet.pa
-!presidencia.pa
-!milpolleras.pa
-!sume911.pa
-!root-ca.pa
+// Some additional second level "domains" resolve directly as hostnames, such as
+// pannet.pa, so we add a rule for "pa".
+pa
+ac.pa
+gob.pa
+com.pa
+org.pa
+sld.pa
+edu.pa
+net.pa
+ing.pa
+abo.pa
+med.pa
+nom.pa
// pe : https://www.nic.pe/InformeFinalComision.pdf
pe
@@ -3672,15 +3667,17 @@ ac.rs
gov.rs
in.rs
-// ru : http://en.wikipedia.org/wiki/.ru
+// ru : http://www.cctld.ru/ru/docs/aktiv_8.php
+// Industry domains
ru
ac.ru
com.ru
+edu.ru
+int.ru
net.ru
org.ru
pp.ru
-int.ru
-// Geographic domains (http://www.ripn.net:8082/nic/dns/geo_list.html)
+// Geographical domains
adygeya.ru
altai.ru
amur.ru
@@ -3726,17 +3723,17 @@ kurgan.ru
kursk.ru
lipetsk.ru
magadan.ru
+mari.ru
mari-el.ru
marine.ru
-mari.ru
mordovia.ru
mosreg.ru
msk.ru
murmansk.ru
nalchik.ru
nnov.ru
-novosibirsk.ru
nov.ru
+novosibirsk.ru
nsk.ru
omsk.ru
orenburg.ru
@@ -3783,8 +3780,7 @@ yamal.ru
yaroslavl.ru
yekaterinburg.ru
yuzhno-sakhalinsk.ru
-// Geographic domains registered before the adoption of the rules on the
-// second level domain registration
+// More geographical domains
amursk.ru
baikal.ru
cmw.ru
@@ -3804,9 +3800,13 @@ pyatigorsk.ru
rubtsovsk.ru
snz.ru
syzran.ru
-tagil.ru
vdonsk.ru
zgrad.ru
+// State domains
+gov.ru
+mil.ru
+// Technical domains
+test.ru
// rw : http://www.nic.rw/cgi-bin/policy.pl
rw
@@ -3820,19 +3820,15 @@ int.rw
mil.rw
gouv.rw
-// sa : http://www.saudinic.net.sa/page.php?page=1&lang=1
-// List with redundant entries as submitted by registry <sa-tld-tech-contact@nic.net.sa> 2008-06-23
-//*.sa
-//com.sa
-//net.sa
-//org.sa
-//gov.sa
-//med.sa
-//pub.sa
-//edu.sa
-//sch.sa
-// As discussed in bug #447815 on bugzilla.mozilla.org, the list has been truncated.
-*.sa
+// sa : http://www.nic.net.sa/
+com.sa
+net.sa
+org.sa
+gov.sa
+med.sa
+pub.sa
+edu.sa
+sch.sa
// sb : http://www.sbnic.net.sb/
// Submitted by registry <lee.humphries@telekom.com.sb> 2008-06-08
@@ -4272,18 +4268,10 @@ wa.us
wi.us
wv.us
wy.us
-// the following rules would be only valid under the geo-name, but we can't express that
-// *.*.us cities, counties, parishes, and townships (locality.state.us)
-// !ci.*.*.us city government agencies (subdomain under locality)
-// !town.*.*.us town government agencies (subdomain under locality)
-// !co.*.*.us county government agencies (subdomain under locality)
-// k12.*.us public school districts
-// pvt.k12.*.us private schools
-// cc.*.us community colleges
-// tec.*.us technical and vocational schools
-// lib.*.us state, regional, city, and county libraries
-// state.*.us state government agencies
-// gen.*.us general independent entities (groups not fitting into the above categories)
+// The registrar notes several more specific domains available in each state,
+// such as state.*.us, dst.*.us, etc., but resolution of these is somewhat
+// haphazard; in some states these domains resolve as addresses, while in others
+// only subdomains are avilable, or even nothing at all.
// uy : http://www.antel.com.uy/
*.uy
@@ -4313,12 +4301,16 @@ edu.vc
// vg : http://en.wikipedia.org/wiki/.vg
vg
-// vi : http://www.nic.vi/Domain_Rules/body_domain_rules.html
+// vi : http://www.nic.vi/newdomainform.htm
+// http://www.nic.vi/Domain_Rules/body_domain_rules.html indicates some other
+// TLDs are "reserved", such as edu.vi and gov.vi, but doesn't actually say they
+// are available for registration (which they do not seem to be).
vi
+co.vi
com.vi
+k12.vi
+net.vi
org.vi
-edu.vi
-gov.vi
// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp
vn