Bug 438585 - "Updates to Public Suffix List" [p=dwitte]
authorGervase Markham <gerv@gerv.net>
Sat, 12 Jul 2008 06:56:15 -0500
changeset 15880 c5a99dd3ae515b48fe61f8e8d14991b0ae0483a0
parent 15879 f08f6a21deb764e6d104c56ff6901436cdb48d94
child 15881 a1c44dbf59f250685cda7fee3c55711faa7e824c
push id570
push userreed@reedloden.com
push dateSat, 12 Jul 2008 11:55:55 +0000
treeherderautoland@c5a99dd3ae51 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs438585
milestone1.9.1a1pre
Bug 438585 - "Updates to Public Suffix List" [p=dwitte]
netwerk/dns/src/effective_tld_names.dat
netwerk/test/unit/test_bug414122.js
--- a/netwerk/dns/src/effective_tld_names.dat
+++ b/netwerk/dns/src/effective_tld_names.dat
@@ -15,33 +15,33 @@
 // 
 // The Initial Developer of the Original Code is
 // Jo Hermans <jo.hermans@gmail.com>.
 // Portions created by the Initial Developer are Copyright (C) 2007
 // the Initial Developer. All Rights Reserved.
 // 
 // Contributor(s):
 //   Ruben Arakelyan <ruben@wackomenace.co.uk>
+//   Gervase Markham <gerv@gerv.net>
+//   The kind representatives of many TLD registries
 // 
 // Alternatively, the contents of this file may be used under the terms of
 // either the GNU General Public License Version 2 or later (the "GPL"), or
 // the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 // in which case the provisions of the GPL or the LGPL are applicable instead
 // of those above. If you wish to allow use of your version of this file only
 // under the terms of either the GPL or the LGPL, and not to allow others to
 // use your version of this file under the terms of the MPL, indicate your
 // decision by deleting the provisions above and replace them with the notice
 // and other provisions required by the GPL or the LGPL. If you do not delete
 // the provisions above, a recipient may use your version of this file under
 // the terms of any one of the MPL, the GPL or the LGPL.
 // 
 // ***** END LICENSE BLOCK *****
 
-// $Id$
-
 // ac : http://en.wikipedia.org/wiki/.ac
 ac
 com.ac
 edu.ac
 gov.ac
 net.ac
 mil.ac
 org.ac
@@ -218,22 +218,27 @@ in-addr.arpa
 ip6.arpa
 uri.arpa
 urn.arpa
 
 // as : http://en.wikipedia.org/wiki/.as
 as
 
 // at : http://en.wikipedia.org/wiki/.at
+// Confirmed by registry <it@nic.at> 2008-06-17
 at
 gv.at
 ac.at
 co.at
 or.at
 
+// priv.at : http://www.nic.priv.at/
+// Submitted by registry <lendl@nic.at> 2008-06-09
+priv.at
+
 // au : http://en.wikipedia.org/wiki/.au
 *.au
 // au geographical names (vic.au etc... are covered above)
 act.edu.au
 nsw.edu.au
 nt.edu.au
 qld.edu.au
 sa.edu.au
@@ -291,16 +296,17 @@ edu.bb
 gov.bb
 net.bb
 org.bb
 
 // bd : http://en.wikipedia.org/wiki/.bd
 *.bd
 
 // be : http://en.wikipedia.org/wiki/.be
+// Confirmed by registry <tech@dns.be> 2008-06-08
 be
 ac.be
 
 // bf : http://en.wikipedia.org/wiki/.bf
 bf
 
 // bg : http://en.wikipedia.org/wiki/.bg
 bg
@@ -415,16 +421,19 @@ com.bs
 net.bs
 org.bs
 edu.bs
 gov.bs
 
 // bt : http://en.wikipedia.org/wiki/.bt
 *.bt
 
+// bv : No registrations at this time.
+// Submitted by registry <jarle@uninett.no> 2006-06-16
+
 // bw : http://en.wikipedia.org/wiki/.bw
 // list of 2nd level tlds ?
 bw
 
 // by : http://en.wikipedia.org/wiki/.by
 // list of 2nd level tlds ?
 by
 
@@ -477,23 +486,28 @@ ci
 
 // cl : http://en.wikipedia.org/wiki/.cl
 cl
 
 // cm : http://en.wikipedia.org/wiki/.cm
 cm
 
 // cn : http://en.wikipedia.org/wiki/.cn
+// Submitted by registry <tanyaling@cnnic.cn> 2008-06-11
 cn
 ac.cn
 com.cn
 edu.cn
 gov.cn
 net.cn
 org.cn
+mil.cn
+公司.cn
+网络.cn
+網絡.cn
 // cn geographic names
 ah.cn
 bj.cn
 cq.cn
 fj.cn
 gd.cn
 gs.cn
 gz.cn
@@ -516,23 +530,61 @@ sd.cn
 sh.cn
 sn.cn
 sx.cn
 tj.cn
 xj.cn
 xz.cn
 yn.cn
 zj.cn
+hk.cn
+mo.cn
+tw.cn
 
 // co : http://en.wikipedia.org/wiki/.co
-*.co
+// Submitted by registry <tecnico@uniandes.edu.co> 2008-06-11
+co
+arts.co
+com.co
+edu.co
+firm.co
+gov.co
+info.co
+int.co
+mil.co
+net.co
+nom.co
+org.co
+rec.co
+web.co
 
 // com : http://en.wikipedia.org/wiki/.com
 com
 
+// CentralNic names : http://www.centralnic.com/names/domains
+// Confirmed by registry <gavin.brown@centralnic.com> 2008-06-09
+ar.com
+br.com
+cn.com
+de.com
+eu.com
+gb.com
+hu.com
+jpn.com
+kr.com
+no.com
+qc.com
+ru.com
+sa.com
+se.com
+uk.com
+us.com
+uy.com
+za.com
+
 // coop : http://en.wikipedia.org/wiki/.coop
 coop
 
 // cr : http://en.wikipedia.org/wiki/.cr
 *.cr
 
 // cu : http://en.wikipedia.org/wiki/.cu
 cu
@@ -557,16 +609,17 @@ cz
 
 // de : http://en.wikipedia.org/wiki/.de
 de
 
 // dj : http://en.wikipedia.org/wiki/.dj
 dj
 
 // dk : http://en.wikipedia.org/wiki/.dk
+// Confirmed by registry <robert@dk-hostmaster.dk> 2008-06-17
 dk
 
 // dm : http://en.wikipedia.org/wiki/.dm
 dm
 com.dm
 net.dm
 org.dm
 
@@ -669,16 +722,19 @@ medecin.fr
 notaires.fr
 pharmacien.fr
 port.fr
 veterinaire.fr
 
 // ga : http://en.wikipedia.org/wiki/.ga
 ga
 
+// gb : This registry is effectively dormant
+// Submitted by registry <Damien.Shaw@ja.net> 2008-06-12
+
 // gd : http://en.wikipedia.org/wiki/.gd
 gd
 
 // ge : http://www.nic.net.ge/policy_en.pdf
 ge
 com.ge
 edu.ge
 gov.ge
@@ -712,32 +768,39 @@ org.gi
 
 // gl : http://en.wikipedia.org/wiki/.gl
 gl
 
 // gm : http://www.nic.gm/htmlpages%5Cgm-policy.htm
 gm
 
 // gn : http://psg.com/dns/gn/gn.txt
-*.gn
+// Submitted by registry <randy@psg.com> 2008-06-17
+ac.gn
+com.gn
+edu.gn
+gov.gn
+org.gn
+net.gn
 
 // gov : http://en.wikipedia.org/wiki/.gov
 gov
 
 // gp : http://www.nic.gp/index_en.php?url=charte_en.php
 gp
 com.gp
 net.gp
 edu.gp
 org.gp
 
 // gq : http://en.wikipedia.org/wiki/.gq
 gq
 
-// gr : https://grweb.ics.forth.gr/english/1617-B-2002.html
+// gr : https://grweb.ics.forth.gr/english/1617-B-2005.html
+// Submitted by registry <segred@ics.forth.gr> 2008-06-09
 gr
 com.gr
 edu.gr
 net.gr
 org.gr
 gov.gr
 
 // gs : http://en.wikipedia.org/wiki/.gs
@@ -750,24 +813,40 @@ gs
 *.gu
 
 // gw : http://en.wikipedia.org/wiki/.gw
 gw
 
 // gy : http://en.wikipedia.org/wiki/.gy
 gy
 
-// hk : http://en.wikipedia.org/wiki/.hk
+// hk : https://www.hkdnr.hk
+// Submitted by registry <hk.tech@hkirc.hk> 2008-06-11
 hk
 com.hk
 edu.hk
 gov.hk
 idv.hk
 net.hk
 org.hk
+公司.hk
+教育.hk
+敎育.hk
+政府.hk
+個人.hk
+个人.hk
+箇人.hk
+網络.hk
+网络.hk
+组織.hk
+網絡.hk
+网絡.hk
+组织.hk
+組織.hk
+組织.hk 
 
 // hm : http://en.wikipedia.org/wiki/.hm
 hm
 
 // hn : http://www.nic.hn/politicas/ps02,,05.html
 hn
 com.hn
 edu.hn
@@ -799,16 +878,17 @@ coop.ht
 pol.ht
 asso.ht
 edu.ht
 rel.ht
 gouv.ht
 perso.ht
 
 // hu : http://www.domain.hu/domain/English/sld.html
+// Confirmed by registry <pasztor@iszt.hu> 2008-06-12
 hu
 co.hu
 info.hu
 org.hu
 priv.hu
 sport.hu
 tm.hu
 2000.hu
@@ -895,16 +975,17 @@ ac.ir
 co.ir
 gov.ir
 id.ir
 net.ir
 org.ir
 sch.ir
 
 // is : http://www.isnic.is/domain/rules.php
+// Confirmed by registry <marius@isgate.is> 2008-12-06
 is
 net.is
 com.is
 edu.is
 gov.is
 org.is
 int.is
 
@@ -1154,42 +1235,47 @@ co.je
 org.je
 net.je
 sch.je
 gov.je
 
 // jm : http://www.com.jm/register.html
 *.jm
 
-// jo : http://www.nis.gov.jo/dns/reg.html
+// jo : http://www.dns.jo/Registration_policy.aspx
 jo
 com.jo
 org.jo
 net.jo
 edu.jo
+sch.jo
 gov.jo
 mil.jo
+name.jo
 myname.jo
 
 // jobs : http://en.wikipedia.org/wiki/.jobs
 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
 jp
+// jp organizational type names 
 ac.jp
 ad.jp
 co.jp
 ed.jp
 go.jp
 gr.jp
 lg.jp
 ne.jp
 or.jp
-// jp geographical names
-// I can't find an official English explanation, but used https://bugzilla.mozilla.org/show_bug.cgi?id=252342#c31
+// jp geographic type names
+// http://jprs.jp/doc/rule/saisoku-1.html
 *.aichi.jp
 *.akita.jp
 *.aomori.jp
 *.chiba.jp
 *.ehime.jp
 *.fukui.jp
 *.fukuoka.jp
 *.fukushima.jp
@@ -1289,16 +1375,17 @@ or.jp
 !city.chiba.jp
 !city.fukuoka.jp
 !city.hiroshima.jp
 !city.kawasaki.jp
 !city.kitakyushu.jp
 !city.kobe.jp
 !city.kyoto.jp
 !city.nagoya.jp
+!city.niigata.jp
 !city.osaka.jp
 !city.saitama.jp
 !city.sapporo.jp
 !city.sendai.jp
 !city.shizuoka.jp
 !city.yokohama.jp
 
 // ke : http://www.kenic.or.ke/index.php?option=com_content&task=view&id=117&Itemid=145
@@ -1365,16 +1452,17 @@ jeonbuk.kr
 jeonnam.kr
 seoul.kr
 ulsan.kr
 
 // kw : http://en.wikipedia.org/wiki/.kw
 *.kw
 
 // ky : http://www.icta.ky/da_ky_reg_dom.php
+// Confirmed by registry <kysupport@perimeterusa.com> 2008-06-17
 ky
 edu.ky
 gov.ky
 com.ky
 org.ky
 net.ky
 
 // kz : http://en.wikipedia.org/wiki/.kz
@@ -1382,20 +1470,36 @@ kz
 org.kz
 edu.kz
 net.kz
 gov.kz
 mil.kz
 com.kz
 
 // la : http://en.wikipedia.org/wiki/.la
+// Submitted by registry <gavin.brown@nic.la> 2008-06-10
 la
+int.la
+net.la
+info.la
+edu.la
+gov.la
+per.la
+com.la
+org.la
+// see http://www.c.la/
+c.la
 
 // lb : http://en.wikipedia.org/wiki/.lb
-*.lb
+// Submitted by registry <randy@psg.com> 2008-06-17
+com.lb
+edu.lb
+gov.lb
+net.lb
+org.lb
 
 // lc : http://en.wikipedia.org/wiki/.lc
 lc
 com.lc
 org.lc
 edu.lc
 gov.lc
 
@@ -1415,17 +1519,22 @@ ngo.lk
 soc.lk
 web.lk
 ltd.lk
 assn.lk
 grp.lk
 hotel.lk
 
 // lr : http://psg.com/dns/lr/lr.txt
-*.lr
+// Submitted by registry <randy@psg.com> 2008-06-17
+com.lr
+edu.lr
+gov.lr
+org.lr
+net.lr
 
 // ls : http://en.wikipedia.org/wiki/.ls
 ls
 co.ls
 org.ls
 
 // lt : http://en.wikipedia.org/wiki/.lt
 lt
@@ -1518,16 +1627,17 @@ net.mo
 org.mo
 edu.mo
 gov.mo
 
 // mobi : http://en.wikipedia.org/wiki/.mobi
 mobi
 
 // mp : http://www.dot.mp/
+// Confirmed by registry <dcamacho@saipan.com> 2008-06-17
 mp
 
 // mq : http://en.wikipedia.org/wiki/.mq
 mq
 
 // mr : http://en.wikipedia.org/wiki/.mr
 mr
 
@@ -1557,17 +1667,25 @@ com.mw
 coop.mw
 edu.mw
 gov.mw
 int.mw
 net.mw
 org.mw
 
 // mx : http://www.nic.mx/
-*.mx
+// 2008-06-23 - Wikipedia says second level registrations are prohibited,
+// but several exist. So, for safety, switched from "*.mx" to the below
+// ruleset until the situation is more clear.
+mx
+com.mx
+org.mx
+gob.mx
+edu.mx
+net.mx
 
 // my : http://www.mynic.net.my/
 *.my
 
 // mz : http://www.gobin.info/domainname/mz-template.doc
 *.mz
 
 // na : http://www.na-nic.com.na/
@@ -1581,46 +1699,66 @@ name
 nc
 
 // ne : http://en.wikipedia.org/wiki/.ne
 ne
 
 // net : http://en.wikipedia.org/wiki/.net
 net
 
+// CentralNic names : http://www.centralnic.com/names/domains
+// Submitted by registry <gavin.brown@centralnic.com> 2008-06-17
+gb.net
+se.net
+uk.net
+
 // nf : http://en.wikipedia.org/wiki/.nf
 nf
 com.nf
 net.nf
 per.nf
 rec.nf
 web.nf
 arts.nf
 firm.nf
 info.nf
 other.nf
 store.nf
 
 // ng : http://psg.com/dns/ng/
-ng
+// Submitted by registry <randy@psg.com> 2008-06-17
+ac.ng
+com.ng
+edu.ng
+gov.ng
+net.ng
+org.ng
 
 // ni : http://www.nic.ni/dominios.htm
 *.ni
 
 // nl : http://www.domain-registry.nl/ace.php/c,728,122,,,,Home.html
+// Confirmed by registry <Antoin.Verschuren@sidn.nl> (with technical
+// reservations) 2008-06-08
 nl
 
 // no : http://www.norid.no/regelverk/index.en.html
+// The Norwegian registry has declined to notify us of updates. The web pages
+// referenced below are the official source of the data. There is also an
+// announce mailing list: 
+// https://postlister.uninett.no/sympa/info/norid-diskusjon
 no
+// Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html
 fhs.no
 vgs.no
 fylkesbibl.no
 folkebibl.no
 museum.no
 idrett.no
+// Non-Norid generic domains : http://www.norid.no/regelverk/vedlegg-d.en.html
 mil.no
 stat.no
 dep.no
 kommune.no
 herad.no
 priv.no
 // no geographical names : http://www.norid.no/regelverk/vedlegg-b.en.html
 // counties
@@ -2181,16 +2319,17 @@ royken.no
 røyken.no
 royrvik.no
 røyrvik.no
 rade.no
 råde.no
 salangen.no
 siellak.no
 saltdal.no
+salat.no
 sálát.no
 sálat.no
 samnanger.no
 sande.more-og-romsdal.no
 sande.møre-og-romsdal.no
 sande.vestfold.no
 sandefjord.no
 sandnes.no
@@ -2320,17 +2459,17 @@ tonsberg.no
 tønsberg.no
 ullensaker.no
 ullensvang.no
 ulvik.no
 utsira.no
 vadso.no
 vadsø.no
 cahcesuolo.no
-cáhcesuolo.no
+čáhcesuolo.no
 vaksdal.no
 valle.no
 vang.no
 vanylven.no
 vardo.no
 vardø.no
 varggat.no
 várggát.no
@@ -2367,16 +2506,17 @@ valer.ostfold.no
 våler.østfold.no
 valer.hedmark.no
 våler.hedmark.no
 
 // np : http://www.mos.com.np/register.html
 *.np
 
 // nr : http://cenpac.net.nr/dns/index.html
+// Confirmed by registry <technician@cenpac.net.nr> 2008-06-17
 nr
 biz.nr
 info.nr
 gov.nr
 edu.nr
 org.nr
 net.nr
 com.nr
@@ -2385,44 +2525,49 @@ com.nr
 nu
 
 // nz : http://en.wikipedia.org/wiki/.nz
 *.nz
 
 // om : http://en.wikipedia.org/wiki/.om
 *.om
 
-// org : http://en.wikipedia.org/wiki/.og
+// org : http://en.wikipedia.org/wiki/.org
 org
 
+// CentralNic names : http://www.centralnic.com/names/domains
+// Submitted by registry <gavin.brown@centralnic.com> 2008-06-17
+ae.org
+
 // pa : http://www.nic.pa/
 *.pa
 
 // pe : http://www.nic.pe/normas-proced-i.htm
 *.pe
 
 // pf : http://www.gobin.info/domainname/formulaire-pf.pdf
 pf
 com.pf
 org.pf
 edu.pf
 
 // pg : http://en.wikipedia.org/wiki/.pg
 *.pg
 
 // ph : http://www.domains.ph/FAQ2.asp
-// list of 2nd level tlds ?
+// Submitted by registry <jed@email.com.ph> 2008-06-13
 ph
 com.ph
 net.ph
 org.ph
 gov.ph
 edu.ph
 ngo.ph
 mil.ph
+i.ph
 
 // pk : http://pk5.pknic.net.pk/pk5/msgNamepk.PK
 pk
 com.pk
 net.pk
 edu.pk
 org.pk
 fam.pk
@@ -2731,34 +2876,40 @@ co.rw
 int.rw
 mil.rw
 gouv.rw
 
 // sa : http://www.saudinic.net.sa/page.php?page=1&lang=1
 *.sa
 
 // sb : http://www.sbnic.net.sb/
-*.sb
+// Submitted by registry <lee.humphries@telekom.com.sb> 2008-06-08
+sb
+com.sb
+edu.sb
+gov.sb
+net.sb
+org.sb
 
 // sc : http://www.nic.sc/
 sc
 com.sc
 gov.sc
 net.sc
 org.sc
 edu.sc
 
 // sd : http://www.isoc.sd/sudanic.isoc.sd/billing_pricing.htm
+// Submitted by registry <admin@isoc.sd> 2008-06-17
 sd
 com.sd
 net.sd
 org.sd
 edu.sd
 med.sd
-tv.sd
 gov.sd
 info.sd
 
 // se : http://en.wikipedia.org/wiki/.se
 se
 org.se
 pp.se
 tm.se
@@ -2799,22 +2950,30 @@ per.sg
 
 // sh : http://www.nic.sh/rules.html
 // list of 2nd level domains ?
 sh
 
 // si : http://en.wikipedia.org/wiki/.si
 si
 
+// sj : No registrations at this time.
+// Submitted by registry <jarle@uninett.no> 2008-06-16
+
 // sk : http://en.wikipedia.org/wiki/.sk
 sk
 
-// sl : http://en.wikipedia.org/wiki/.sl
-// list of 2nd level domains ?
+// sl : http://www.nic.sl
+// Submitted by registry <adam@neoip.com> 2008-06-12
 sl
+com.sl
+net.sl
+edu.sl
+gov.sl
+org.sl
 
 // sm : http://en.wikipedia.org/wiki/.sm
 sm
 
 // sn : http://en.wikipedia.org/wiki/.sn
 // list of 2nd level domains ?
 sn
 
@@ -2846,17 +3005,25 @@ td
 // tf : http://en.wikipedia.org/wiki/.tf
 tf
 
 // tg : http://en.wikipedia.org/wiki/.tg
 // list of 2nd level domains ?
 tg
 
 // th : http://en.wikipedia.org/wiki/.th
-*.th
+// Submitted by registry <krit@thains.co.th> 2008-06-17
+th
+ac.th
+co.th
+go.th
+in.th
+mi.th
+net.th
+or.th
 
 // tj : http://www.nic.tj/policy.htm
 tj
 ac.tj
 biz.tj
 com.tj
 co.tj
 edu.tj
@@ -2880,18 +3047,24 @@ tl
 // list of 2nd level tlds ?
 tm
 
 // tn : http://en.wikipedia.org/wiki/.tn
 // list of 2nd level tlds ?
 tn
 
 // to : http://en.wikipedia.org/wiki/.to
-// list of 2nd level tlds ?
+// Submitted by registry <egullich@colo.to> 2008-06-17
 to
+com.to
+gov.to
+net.to
+org.to
+edu.to
+mil.to
 
 // tr : http://en.wikipedia.org/wiki/.tr
 *.tr
 
 // travel : http://en.wikipedia.org/wiki/.travel
 travel
 
 // tt : http://www.nic.tt/
@@ -2930,17 +3103,22 @@ idv.tw
 game.tw
 ebiz.tw
 club.tw
 網路.tw
 組織.tw
 商業.tw
 
 // tz : http://en.wikipedia.org/wiki/.tz
-*.tz
+// Submitted by registry <randy@psg.com> 2008-06-17
+ac.tz
+co.tz
+go.tz
+ne.tz
+or.tz
 
 // ua : http://www.nic.net.ua/
 ua
 com.ua
 edu.ua
 gov.ua
 net.ua
 org.ua
@@ -3096,18 +3274,24 @@ wy.us
 uz
 com.uz
 co.uz
 
 // va : http://en.wikipedia.org/wiki/.va
 va
 
 // vc : http://en.wikipedia.org/wiki/.vc
-// list of 2nd level tlds ?
+// Submitted by registry <kshah@ca.afilias.info> 2008-06-13
 vc
+com.vc
+net.vc
+org.vc
+gov.vc
+mil.vc
+edu.vc
 
 // ve : http://registro.nic.ve/nicve/registro/index.html
 *.ve
 
 // vg : http://en.wikipedia.org/wiki/.vg
 vg
 
 // vi : http://www.nic.vi/Domain_Rules/body_domain_rules.html
@@ -3148,9 +3332,8 @@ ws
 // za : http://www.zadna.org.za/slds.html
 *.za
 
 // zm : http://en.wikipedia.org/wiki/.zm
 *.zm
 
 // zw : http://en.wikipedia.org/wiki/.zw
 *.zw
-
--- a/netwerk/test/unit/test_bug414122.js
+++ b/netwerk/test/unit/test_bug414122.js
@@ -21,16 +21,17 @@ function run_test()
   lis.QueryInterface(Ci.nsIUnicharLineInputStream);
 
   var out = { value: "" };
   do
   {
     var more = lis.readLine(out);
     var line = out.value;
 
+    line = line.replace(/^\s+/, "");
     var firstTwo = line.substring(0, 2); // a misnomer, but whatever
     if (firstTwo == "" || firstTwo == "//")
       continue;
 
     var space = line.search(/[ \t]/);
     line = line.substring(0, space == -1 ? line.length : space);
 
     if ("*." == firstTwo)