Bug 712640 - Split PSL into "registry" and "owner-requested" sections. r=pkasting.
authorGervase Markham <gerv@gerv.net>
Tue, 06 Mar 2012 11:49:00 +0000
changeset 89553 91e535989963bfe7389caa6061d06681b36bb9a4
parent 89552 87d12a41e3e0beaeb5a52de6cec9b3421be8d329
child 89554 fc874873ea213e7548cb6c1bf9240d35d66ae757
push idunknown
push userunknown
push dateunknown
reviewerspkasting
bugs712640
milestone13.0a1
Bug 712640 - Split PSL into "registry" and "owner-requested" sections. r=pkasting.
netwerk/dns/effective_tld_names.dat
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -35,16 +35,18 @@
 // 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 *****
 
+// ===BEGIN ICANN DOMAINS===
+
 // ac : http://en.wikipedia.org/wiki/.ac
 ac
 com.ac
 edu.ac
 gov.ac
 net.ac
 mil.ac
 org.ac
@@ -242,24 +244,16 @@ asia
 // at : http://en.wikipedia.org/wiki/.at
 // Confirmed by registry <it@nic.at> 2008-06-17
 at
 ac.at
 co.at
 gv.at
 or.at
 
-// http://www.info.at/
-biz.at
-info.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
 // http://www.auda.org.au/
 // 2LDs
 com.au
 net.au
 org.au
 edu.au
 gov.au
@@ -582,19 +576,16 @@ on.ca
 pe.ca
 qc.ca
 sk.ca
 yk.ca
 // gc.ca: http://en.wikipedia.org/wiki/.gc.ca
 // see also: http://registry.gc.ca/en/SubdomainFAQ
 gc.ca
 
-// co.ca: http://registry.co.ca
-co.ca
-
 // cat : http://en.wikipedia.org/wiki/.cat
 cat
 
 // cc : http://en.wikipedia.org/wiki/.cc
 cc
 
 // cd : http://en.wikipedia.org/wiki/.cd
 // see also: https://www.nic.cd/domain/insertDomain_2.jsp?act=1
@@ -708,45 +699,16 @@ 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
-// Updated by registry <gavin.brown@centralnic.com> 2011-05-27
-ar.com
-br.com
-cn.com
-de.com
-eu.com
-gb.com
-gr.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
-
-// Requested by Yngve Pettersen <yngve@opera.com> 2009-11-26
-operaunite.com
-
-// Requested by Eduardo Vela <evn@google.com> 2010-09-06
-appspot.com
-
 // coop : http://en.wikipedia.org/wiki/.coop
 coop
 
 // cr : http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
 cr
 ac.cr
 co.cr
 ed.cr
@@ -778,20 +740,16 @@ gov.cx
 // cz : http://en.wikipedia.org/wiki/.cz
 cz
 
 // de : http://en.wikipedia.org/wiki/.de
 // Confirmed by registry <ops@denic.de> (with technical
 // reservations) 2008-07-01
 de
 
-// CentralNic names : http://www.centralnic.com/names/domains
-// Submitted by registry <gavin.brown@centralnic.com> 2011-05-27
-com.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
@@ -890,18 +848,16 @@ eu
 // fi : http://en.wikipedia.org/wiki/.fi
 fi
 // aland.fi : http://en.wikipedia.org/wiki/.ax
 // This domain is being phased out in favor of .ax. As there are still many
 // domains under aland.fi, we still keep it on the list until aland.fi is
 // completely removed.
 // TODO: Check for updates (expected to be phased out around Q1/2009)
 aland.fi
-// iki.fi : Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
-iki.fi
 
 // fj : http://en.wikipedia.org/wiki/.fj
 *.fj
 
 // fk : http://en.wikipedia.org/wiki/.fk
 *.fk
 
 // fm : http://en.wikipedia.org/wiki/.fm
@@ -1814,18 +1770,16 @@ 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
@@ -2655,27 +2609,16 @@ nc
 asso.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
-jp.net
-se.net
-uk.net
-
-// ZaNiC names : http://www.za.net/
-// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03
-za.net
-
 // nf : http://en.wikipedia.org/wiki/.nf
 nf
 com.nf
 net.nf
 per.nf
 rec.nf
 web.nf
 arts.nf
@@ -2699,19 +2642,16 @@ org.ng
 // 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
 
 // BV.nl will be a registry for dutch BV's (besloten vennootschap)
 bv.nl
 
-// the co.nl domain is managed by CoDNS B.V. Added 2010-05-23.
-co.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
@@ -3469,19 +3409,16 @@ vagsoy.no
 vågsøy.no
 vaga.no
 vågå.no
 valer.ostfold.no
 våler.østfold.no
 valer.hedmark.no
 våler.hedmark.no
 
-// the co.no domain is managed by CoDNS B.V. Added 2010-05-23.
-co.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
@@ -3508,26 +3445,16 @@ nu
 !rakpetroleum.om
 !siemens.om
 !songfest.om
 !statecouncil.om
 
 // 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
-// Updated by registry <gavin.brown@centralnic.com> 2011-05-27
-ae.org
-us.org
-
-// ZaNiC names : http://www.za.net/
-// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03
-za.org
-
 // pa : http://www.nic.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
@@ -3771,19 +3698,16 @@ med.pl
 sopot.pl
 // other geographical domains
 gliwice.pl
 krakow.pl
 poznan.pl
 wroc.pl
 zakopane.pl
 
-// co.pl : Mainseek Sp. z o.o. http://www.co.pl
-co.pl
-
 // pn : http://www.government.pn/PnRegistry/policies.htm
 pn
 gov.pn
 co.pn
 org.pn
 edu.pn
 net.pn
 
@@ -4937,17 +4861,87 @@ xxx
 *.za
 
 // zm : http://en.wikipedia.org/wiki/.zm
 *.zm
 
 // zw : http://en.wikipedia.org/wiki/.zw
 *.zw
 
-// DynDNS.com Dynamic DNS zones : http://www.dyndns.com/services/dns/dyndns/
+// ===END ICANN DOMAINS===
+// ===BEGIN PRIVATE DOMAINS===
+
+// info.at : http://www.info.at/
+biz.at
+info.at
+
+// priv.at : http://www.nic.priv.at/
+// Submitted by registry <lendl@nic.at> 2008-06-09
+priv.at
+
+// co.ca : http://registry.co.ca
+co.ca
+
+// CentralNic : 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
+gr.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
+gb.net
+jp.net
+se.net
+uk.net
+ae.org
+us.org
+com.de
+
+// Opera Software, A.S.A.
+// Requested by Yngve Pettersen <yngve@opera.com> 2009-11-26
+operaunite.com
+
+// Google, Inc.
+// Requested by Eduardo Vela <evn@google.com> 2010-09-06
+appspot.com
+
+// iki.fi : Submitted by Hannu Aronsson <haa@iki.fi> 2009-11-05
+iki.fi
+
+// c.la : http://www.c.la/
+c.la
+
+// ZaNiC : http://www.za.net/
+// Confirmed by registry <hostmaster@nic.za.net> 2009-10-03
+za.net
+za.org
+
+// CoDNS B.V.
+// Added 2010-05-23.
+co.nl
+co.no
+
+// Mainseek Sp. z o.o. : http://www.co.pl/
+co.pl
+
+// DynDNS.com : http://www.dyndns.com/services/dns/dyndns/
 dyndns-at-home.com
 dyndns-at-work.com
 dyndns-blog.com
 dyndns-free.com
 dyndns-home.com
 dyndns-ip.com
 dyndns-mail.com
 dyndns-office.com
@@ -5217,8 +5211,10 @@ teaches-yoga.com
 thruhere.net
 traeumtgerade.de
 webhop.biz
 webhop.info
 webhop.net
 webhop.org
 worse-than.tv
 writesthisblog.com
+
+// ===END PRIVATE DOMAINS===