Bug 802568 - PSL and IDN TLD whitelist uplift for Firefox 17. a=lsblakk.
authorGervase Markham <gerv@gerv.net>
Sat, 10 Nov 2012 16:05:22 +0000
changeset 116811 e5aa14969f18cd4530bf1c06342fc6d6c62d8c4b
parent 116810 34c4f8b76f49b59fe1459434e611c106cb105b67
child 116812 fae3b9538755588210b4b467fc3edfa1e6a86fa8
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsblakk
bugs802568
milestone18.0a2
Bug 802568 - PSL and IDN TLD whitelist uplift for Firefox 17. a=lsblakk.
modules/libpref/src/init/all.js
netwerk/dns/effective_tld_names.dat
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1028,16 +1028,17 @@ pref("network.IDN.whitelist.cl", true);
 pref("network.IDN.whitelist.cn", true);
 pref("network.IDN.whitelist.de", true);
 pref("network.IDN.whitelist.dk", true);
 pref("network.IDN.whitelist.ee", true);
 pref("network.IDN.whitelist.es", true);
 pref("network.IDN.whitelist.fi", true);
 pref("network.IDN.whitelist.fr", true);
 pref("network.IDN.whitelist.gr", true);
+pref("network.IDN.whitelist.gt", true);
 pref("network.IDN.whitelist.hu", true);
 pref("network.IDN.whitelist.il", true);
 pref("network.IDN.whitelist.io", true);
 pref("network.IDN.whitelist.ir", true);
 pref("network.IDN.whitelist.is", true);
 pref("network.IDN.whitelist.jp", true);
 pref("network.IDN.whitelist.kr", true);
 pref("network.IDN.whitelist.li", true);
@@ -1099,18 +1100,21 @@ pref("network.IDN.whitelist.xn--o3cw4h",
 // tw, Taiwan, <.Taiwan> with variants
 pref("network.IDN.whitelist.xn--kpry57d", true);  // Traditional
 pref("network.IDN.whitelist.xn--kprw13d", true);  // Simplified
 
 // gTLDs
 pref("network.IDN.whitelist.asia", true);
 pref("network.IDN.whitelist.biz", true);
 pref("network.IDN.whitelist.cat", true);
+pref("network.IDN.whitelist.com", true);
 pref("network.IDN.whitelist.info", true);
 pref("network.IDN.whitelist.museum", true);
+pref("network.IDN.whitelist.name", true);
+pref("network.IDN.whitelist.net", true);
 pref("network.IDN.whitelist.org", true);
 pref("network.IDN.whitelist.tel", true);
 
 // NOTE: Before these can be removed, one of bug 414812's tests must be updated
 //       or it will likely fail!  Please CC jwalden+bmo on the bug associated
 //       with removing these so he can provide a patch to make the necessary
 //       changes to avoid bustage.
 // ".test" localised TLDs for ICANN's top-level IDN trial
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -214,17 +214,16 @@ or.at
 // au : http://en.wikipedia.org/wiki/.au
 // http://www.auda.org.au/
 // 2LDs
 com.au
 net.au
 org.au
 edu.au
 gov.au
-csiro.au
 asn.au
 id.au
 // Historic 2LDs (closed to new registration, but sites still exist)
 info.au
 conf.au
 oz.au
 // CGDNs - http://www.cgdn.org.au/
 act.au
@@ -945,19 +944,25 @@ com.gr
 edu.gr
 net.gr
 org.gr
 gov.gr
 
 // gs : http://en.wikipedia.org/wiki/.gs
 gs
 
-// gt : http://www.gt/politicas.html
-*.gt
-!www.gt
+// gt : http://www.gt/politicas_de_registro.html
+gt
+com.gt
+edu.gt
+gob.gt
+ind.gt
+mil.gt
+net.gt
+org.gt
 
 // gu : http://gadao.gov.gu/registration.txt
 *.gu
 
 // gw : http://en.wikipedia.org/wiki/.gw
 gw
 
 // gy : http://en.wikipedia.org/wiki/.gy
@@ -4161,16 +4166,17 @@ net.my
 org.my
 gov.my
 edu.my
 mil.my
 name.my
 
 // mz : http://www.gobin.info/domainname/mz-template.doc
 *.mz
+!teledata.mz
 
 // na : http://www.na-nic.com.na/
 // http://www.info.na/domain/
 na
 info.na
 pro.na
 name.na
 school.na
@@ -5354,18 +5360,27 @@ nome.pt
 pw
 co.pw
 ne.pw
 or.pw
 ed.pw
 go.pw
 belau.pw
 
-// py : http://www.nic.py/faq_a.html#faq_b
-*.py
+// py : http://www.nic.py/pautas.html#seccion_9
+// Confirmed by registry 2012-10-03
+com.py
+coop.py
+edu.py
+gov.py
+mil.py
+net.py
+org.py
+!nic.py
+!una.py
 
 // qa : http://domains.qa/en/
 qa
 com.qa
 edu.qa
 gov.qa
 mil.qa
 name.qa
@@ -5994,30 +6009,29 @@ or.ug
 ac.ug
 sc.ug
 go.ug
 ne.ug
 com.ug
 org.ug
 
 // uk : http://en.wikipedia.org/wiki/.uk
+// Submitted by registry <noc@nominet.org.uk> 2012-10-02
+// and tweaked by us pending further consultation.
 *.uk
 *.sch.uk
 !bl.uk
 !british-library.uk
-!icnet.uk
 !jet.uk
 !mod.uk
+!national-library-scotland.uk
 !nel.uk
-!nhs.uk
 !nic.uk
 !nls.uk
-!national-library-scotland.uk
 !parliament.uk
-!police.uk
 
 // us : http://en.wikipedia.org/wiki/.us
 us
 dni.us
 fed.us
 isa.us
 kids.us
 nsn.us
@@ -6569,18 +6583,65 @@ us.org
 uy.com
 za.com
 
 // 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
+// Requested by Eduardo Vela <evn@google.com> 2012-10-24
 appspot.com
+blogspot.be
+blogspot.bj
+blogspot.ca
+blogspot.cf
+blogspot.ch
+blogspot.co.at
+blogspot.co.il
+blogspot.co.nz
+blogspot.co.uk
+blogspot.com
+blogspot.com.ar
+blogspot.com.au
+blogspot.com.br
+blogspot.com.es
+blogspot.cv
+blogspot.cz
+blogspot.de
+blogspot.dk
+blogspot.fi
+blogspot.fr
+blogspot.gr
+blogspot.hk
+blogspot.hu
+blogspot.ie
+blogspot.in
+blogspot.it
+blogspot.jp
+blogspot.kr
+blogspot.mr
+blogspot.mx
+blogspot.nl
+blogspot.no
+blogspot.pt
+blogspot.re
+blogspot.ro
+blogspot.se
+blogspot.sg
+blogspot.sk
+blogspot.td
+blogspot.tw
+codespot.com
+googleapis.com
+googlecode.com
+
+// DreamHost : http://www.dreamhost.com/
+// Requested by Andrew Farmer <andrew.farmer@dreamhost.com> 2012-10-02
+dreamhosters.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/
@@ -6872,9 +6933,17 @@ thruhere.net
 traeumtgerade.de
 webhop.biz
 webhop.info
 webhop.net
 webhop.org
 worse-than.tv
 writesthisblog.com
 
+// BetaInABox
+// Requested by adrian@betainabox.com 2012-09-13
+betainabox.com
+
+// Red Hat, Inc. OpenShift : https://openshift.redhat.com/
+// Requested by Tim Kramer <tkramer@rhcloud.com> 2012-10-24
+rhcloud.com
+
 // ===END PRIVATE DOMAINS===