Back out Public Suffix List changes at myk's request

This commit is contained in:
Gervase Markham 2008-07-10 23:04:06 +01:00
Родитель a711a9b12f
Коммит f751214c57
2 изменённых файлов: 25 добавлений и 209 удалений

Просмотреть файл

@ -20,8 +20,6 @@
//
// 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
@ -37,6 +35,8 @@
//
// ***** END LICENSE BLOCK *****
// $Id$
// ac : http://en.wikipedia.org/wiki/.ac
ac
com.ac
@ -223,17 +223,12 @@ urn.arpa
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)
@ -301,7 +296,6 @@ org.bb
*.bd
// be : http://en.wikipedia.org/wiki/.be
// Confirmed by registry <tech@dns.be> 2008-06-08
be
ac.be
@ -426,9 +420,6 @@ 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
@ -491,7 +482,6 @@ cl
cm
// cn : http://en.wikipedia.org/wiki/.cn
// Submitted by registry <tanyaling@cnnic.cn> 2008-06-11
cn
ac.cn
com.cn
@ -499,10 +489,6 @@ edu.cn
gov.cn
net.cn
org.cn
mil.cn
公司.cn
网络.cn
網絡.cn
// cn geographic names
ah.cn
bj.cn
@ -535,51 +521,13 @@ xj.cn
xz.cn
yn.cn
zj.cn
hk.cn
mo.cn
tw.cn
// co : http://en.wikipedia.org/wiki/.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
*.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
@ -614,7 +562,6 @@ de
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
@ -727,9 +674,6 @@ 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
@ -773,13 +717,7 @@ gl
gm
// gn : http://psg.com/dns/gn/gn.txt
// Submitted by registry <randy@psg.com> 2008-06-17
ac.gn
com.gn
edu.gn
gov.gn
org.gn
net.gn
*.gn
// gov : http://en.wikipedia.org/wiki/.gov
gov
@ -794,8 +732,7 @@ org.gp
// gq : http://en.wikipedia.org/wiki/.gq
gq
// gr : https://grweb.ics.forth.gr/english/1617-B-2005.html
// Submitted by registry <segred@ics.forth.gr> 2008-06-09
// gr : https://grweb.ics.forth.gr/english/1617-B-2002.html
gr
com.gr
edu.gr
@ -818,8 +755,7 @@ gw
// gy : http://en.wikipedia.org/wiki/.gy
gy
// hk : https://www.hkdnr.hk
// Submitted by registry <hk.tech@hkirc.hk> 2008-06-11
// hk : http://en.wikipedia.org/wiki/.hk
hk
com.hk
edu.hk
@ -827,21 +763,6 @@ 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
@ -883,7 +804,6 @@ 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
@ -980,7 +900,6 @@ 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
@ -1240,26 +1159,21 @@ gov.je
// jm : http://www.com.jm/register.html
*.jm
// jo : http://www.dns.jo/Registration_policy.aspx
// jo : http://www.nis.gov.jo/dns/reg.html
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
@ -1269,8 +1183,8 @@ gr.jp
lg.jp
ne.jp
or.jp
// jp geographic type names
// http://jprs.jp/doc/rule/saisoku-1.html
// jp geographical names
// I can't find an official English explanation, but used https://bugzilla.mozilla.org/show_bug.cgi?id=252342#c31
*.aichi.jp
*.akita.jp
*.aomori.jp
@ -1380,7 +1294,6 @@ or.jp
!city.kobe.jp
!city.kyoto.jp
!city.nagoya.jp
!city.niigata.jp
!city.osaka.jp
!city.saitama.jp
!city.sapporo.jp
@ -1457,7 +1370,6 @@ ulsan.kr
*.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
@ -1475,26 +1387,10 @@ 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
// Submitted by registry <randy@psg.com> 2008-06-17
com.lb
edu.lb
gov.lb
net.lb
org.lb
*.lb
// lc : http://en.wikipedia.org/wiki/.lc
lc
@ -1524,12 +1420,7 @@ grp.lk
hotel.lk
// lr : http://psg.com/dns/lr/lr.txt
// Submitted by registry <randy@psg.com> 2008-06-17
com.lr
edu.lr
gov.lr
org.lr
net.lr
*.lr
// ls : http://en.wikipedia.org/wiki/.ls
ls
@ -1632,7 +1523,6 @@ gov.mo
mobi
// mp : http://www.dot.mp/
// Confirmed by registry <dcamacho@saipan.com> 2008-06-17
mp
// mq : http://en.wikipedia.org/wiki/.mq
@ -1672,15 +1562,7 @@ net.mw
org.mw
// mx : http://www.nic.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
*.mx
// my : http://www.mynic.net.my/
*.my
@ -1704,12 +1586,6 @@ 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
@ -1724,36 +1600,22 @@ other.nf
store.nf
// ng : http://psg.com/dns/ng/
// Submitted by registry <randy@psg.com> 2008-06-17
ac.ng
com.ng
edu.ng
gov.ng
net.ng
org.ng
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
@ -2324,7 +2186,6 @@ råde.no
salangen.no
siellak.no
saltdal.no
salat.no
sálát.no
sálat.no
samnanger.no
@ -2464,7 +2325,7 @@ utsira.no
vadso.no
vadsø.no
cahcesuolo.no
čáhcesuolo.no
cáhcesuolo.no
vaksdal.no
valle.no
vang.no
@ -2511,7 +2372,6 @@ våler.hedmark.no
*.np
// nr : http://cenpac.net.nr/dns/index.html
// Confirmed by registry <technician@cenpac.net.nr> 2008-06-17
nr
biz.nr
info.nr
@ -2530,13 +2390,9 @@ nu
// om : http://en.wikipedia.org/wiki/.om
*.om
// org : http://en.wikipedia.org/wiki/.org
// org : http://en.wikipedia.org/wiki/.og
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
@ -2553,7 +2409,7 @@ edu.pf
*.pg
// ph : http://www.domains.ph/FAQ2.asp
// Submitted by registry <jed@email.com.ph> 2008-06-13
// list of 2nd level tlds ?
ph
com.ph
net.ph
@ -2562,7 +2418,6 @@ gov.ph
edu.ph
ngo.ph
mil.ph
i.ph
// pk : http://pk5.pknic.net.pk/pk5/msgNamepk.PK
pk
@ -2881,13 +2736,7 @@ gouv.rw
*.sa
// sb : http://www.sbnic.net.sb/
// Submitted by registry <lee.humphries@telekom.com.sb> 2008-06-08
sb
com.sb
edu.sb
gov.sb
net.sb
org.sb
*.sb
// sc : http://www.nic.sc/
sc
@ -2898,13 +2747,13 @@ 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
@ -2955,20 +2804,12 @@ 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://www.nic.sl
// Submitted by registry <adam@neoip.com> 2008-06-12
// sl : http://en.wikipedia.org/wiki/.sl
// list of 2nd level domains ?
sl
com.sl
net.sl
edu.sl
gov.sl
org.sl
// sm : http://en.wikipedia.org/wiki/.sm
sm
@ -3010,15 +2851,7 @@ tf
tg
// th : http://en.wikipedia.org/wiki/.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
*.th
// tj : http://www.nic.tj/policy.htm
tj
@ -3052,14 +2885,8 @@ tm
tn
// to : http://en.wikipedia.org/wiki/.to
// Submitted by registry <egullich@colo.to> 2008-06-17
// list of 2nd level tlds ?
to
com.to
gov.to
net.to
org.to
edu.to
mil.to
// tr : http://en.wikipedia.org/wiki/.tr
*.tr
@ -3108,12 +2935,7 @@ club.tw
商業.tw
// tz : http://en.wikipedia.org/wiki/.tz
// Submitted by registry <randy@psg.com> 2008-06-17
ac.tz
co.tz
go.tz
ne.tz
or.tz
*.tz
// ua : http://www.nic.net.ua/
ua
@ -3279,14 +3101,8 @@ co.uz
va
// vc : http://en.wikipedia.org/wiki/.vc
// Submitted by registry <kshah@ca.afilias.info> 2008-06-13
// list of 2nd level tlds ?
vc
com.vc
net.vc
org.vc
gov.vc
mil.vc
edu.vc
// ve : http://registro.nic.ve/nicve/registro/index.html
*.ve
@ -3337,3 +3153,4 @@ ws
// zw : http://en.wikipedia.org/wiki/.zw
*.zw

Просмотреть файл

@ -26,7 +26,6 @@ function run_test()
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;