Bug 1024964 - Uplift recent PSL changes to Firefox 31 and 32. r=gerv, a=sledru
authorGervase Markham <gerv@gerv.net>
Fri, 13 Jun 2014 05:35:00 -0400
changeset 208072 5301b6d459ae47332032e0be3ef04d404270e860
parent 208071 f978315a6f2e69f01a3a77ee5db99b0102824abd
child 208073 b40d5a52870b2ae05528d9798400c02fb0f94407
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv, sledru
bugs1024964
milestone32.0a2
Bug 1024964 - Uplift recent PSL changes to Firefox 31 and 32. r=gerv, a=sledru
netwerk/dns/effective_tld_names.dat
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -175,16 +175,17 @@ it.ao
 // aq : http://en.wikipedia.org/wiki/.aq
 aq
 
 // ar : https://nic.ar/normativa-vigente.xhtml
 ar
 com.ar
 edu.ar
 gob.ar
+gov.ar
 int.ar
 mil.ar
 net.ar
 org.ar
 tur.ar
 
 // arpa : http://en.wikipedia.org/wiki/.arpa
 // Confirmed by registry <iana-questions@icann.org> 2008-06-18
@@ -217,17 +218,16 @@ au
 // 2LDs
 com.au
 net.au
 org.au
 edu.au
 gov.au
 asn.au
 id.au
-csiro.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
 nsw.au
 nt.au
@@ -240,17 +240,17 @@ wa.au
 act.edu.au
 nsw.edu.au
 nt.edu.au
 qld.edu.au
 sa.edu.au
 tas.edu.au
 vic.edu.au
 wa.edu.au
-act.gov.au
+// act.gov.au  Bug 984824 - Removed at request of Greg Tankard
 // nsw.gov.au  Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
 // nt.gov.au  Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
 qld.gov.au
 sa.gov.au
 tas.gov.au
 vic.gov.au
 wa.gov.au
 
@@ -287,23 +287,25 @@ unsa.ba
 unbi.ba
 co.ba
 com.ba
 rs.ba
 
 // bb : http://en.wikipedia.org/wiki/.bb
 bb
 biz.bb
+co.bb
 com.bb
 edu.bb
 gov.bb
 info.bb
 net.bb
 org.bb
 store.bb
+tv.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
@@ -591,19 +593,22 @@ gouv.ci
 
 // cl : http://en.wikipedia.org/wiki/.cl
 cl
 gov.cl
 gob.cl
 co.cl
 mil.cl
 
-// cm : http://en.wikipedia.org/wiki/.cm
+// cm : http://en.wikipedia.org/wiki/.cm plus bug 981927
 cm
+co.cm
+com.cm
 gov.cm
+net.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
@@ -5141,17 +5146,34 @@ edu.nr
 org.nr
 net.nr
 com.nr
 
 // nu : http://en.wikipedia.org/wiki/.nu
 nu
 
 // nz : http://en.wikipedia.org/wiki/.nz
-*.nz
+// Confirmed by registry <jay@nzrs.net.nz> 2014-05-19
+nz
+ac.nz
+co.nz
+cri.nz
+geek.nz
+gen.nz
+govt.nz
+health.nz
+iwi.nz
+kiwi.nz
+maori.nz
+mil.nz
+māori.nz
+net.nz
+org.nz
+parliament.nz
+school.nz
 
 // om : http://en.wikipedia.org/wiki/.om
 om
 co.om
 com.om
 edu.om
 gov.om
 med.om
@@ -5608,17 +5630,16 @@ nov.ru
 novosibirsk.ru
 nsk.ru
 omsk.ru
 orenburg.ru
 oryol.ru
 palana.ru
 penza.ru
 perm.ru
-pskov.ru
 ptz.ru
 rnd.ru
 ryazan.ru
 sakhalin.ru
 samara.ru
 saratov.ru
 simbirsk.ru
 smolensk.ru
@@ -6145,29 +6166,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
+// Submitted by registry <Michael.Daly@nominet.org.uk>
+uk
+ac.uk
+co.uk
+gov.uk
+ltd.uk
+me.uk
+net.uk
+nhs.uk
+org.uk
+plc.uk
+police.uk
 *.sch.uk
-!bl.uk
-!british-library.uk
-!jet.uk
-!mod.uk
-!national-library-scotland.uk
-!nel.uk
-!nic.uk
-!nls.uk
-!parliament.uk
 
 // us : http://en.wikipedia.org/wiki/.us
 us
 dni.us
 fed.us
 isa.us
 kids.us
 nsn.us
@@ -6435,26 +6456,34 @@ com.vc
 net.vc
 org.vc
 gov.vc
 mil.vc
 edu.vc
 
 // ve : https://registro.nic.ve/
 // Confirmed by registry 2012-10-04
+// Updated 2014-05-20 - Bug 940478
 ve
+arts.ve
 co.ve
 com.ve
 e12.ve
 edu.ve
+firm.ve
+gob.ve
 gov.ve
 info.ve
+int.ve
 mil.ve
 net.ve
 org.ve
+rec.ve
+store.ve
+tec.ve
 web.ve
 
 // vg : http://en.wikipedia.org/wiki/.vg
 vg
 
 // 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
@@ -6477,18 +6506,22 @@ int.vn
 ac.vn
 biz.vn
 info.vn
 name.vn
 pro.vn
 health.vn
 
 // vu : http://en.wikipedia.org/wiki/.vu
-// list of 2nd level tlds ?
+// http://www.vunic.vu/
 vu
+com.vu
+edu.vu
+net.vu
+org.vu
 
 // wf : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
 wf
 
 // ws : http://en.wikipedia.org/wiki/.ws
 // http://samoanic.ws/index.dhtml
 ws
 com.ws
@@ -6604,17 +6637,24 @@ yt
 عمان
 
 // xn--ygbi2ammx ("Falasteen" Arabic) : PS
 // The Palestinian National Internet Naming Authority (PNINA)
 // http://www.pnina.ps
 فلسطين
 
 // xn--90a3ac ("srb" Cyrillic) : RS
+// http://www.rnids.rs/en/the-.срб-domain
 срб
+пр.срб
+орг.срб
+обр.срб
+од.срб
+упр.срб
+ак.срб
 
 // xn--p1ai ("rf" Russian-Cyrillic) : RU
 // http://www.cctld.ru/en/docs/rulesrf.php
 рф
 
 // xn--wgbl6a ("Qatar" Arabic) : QA
 // http://www.ict.gov.qa/
 قطر
@@ -7628,60 +7668,355 @@ reisen
 airforce
 
 // pictures : 2014-03-07 Foggy Sky, LLC
 pictures
 
 // gripe : 2014-03-07 Corn Sunset, LLC
 gripe
 
-// engineering : 2014-03-07 United TLD Holdco Ltd.
-engineering
+// engineer : 2014-03-07 United TLD Holdco Ltd.
+engineer
 
 // associates : 2014-03-07 Baxter Hill, LLC
 associates
 
 // xn--mxtq1m : 2014-03-07 Net-Chinese Co., Ltd.
 政府
 
 // williamhill : 2014-03-13 William Hill Organization Limited
 williamhill
 
 // hiv : 2014-03-13 dotHIV gemeinnuetziger e.V.
 hiv
 
 // sca : 2014-03-13 SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ)
 sca
 
-// reise : 2014-03-13 dotreise GmbH
+// reise : 2014-03-13 dotreise GmbH 
 reise
 
+// accountants : 2014-03-20 Knob Town, LLC 
+accountants
+
+// clinic : 2014-03-20 Goose Park, LLC 
+clinic
+
+// versicherung : 2014-03-20 dotversicherung-registry GmbH 
+versicherung
+
+// top : 2014-03-20 Jiangsu Bangning Science & Technology Co.,Ltd. 
+top
+
+// furniture : 2014-03-20 Lone Fields, LLC 
+furniture
+
+// dental : 2014-03-20 Tin Birch, LLC 
+dental
+
+// fund : 2014-03-20 John Castle, LLC 
+fund
+
+// creditcard : 2014-03-20 Binky Frostbite, LLC 
+creditcard
+
+// insure : 2014-03-20 Pioneer Willow, LLC 
+insure
+
+// audio : 2014-03-20 Uniregistry, Corp. 
+audio
+
+// claims : 2014-03-20 Black Corner, LLC 
+claims
+
+// loans : 2014-03-20 June Woods, LLC 
+loans
+
+// auction : 2014-03-20 Sand Galley, LLC 
+auction
+
+// attorney : 2014-03-20 Victor North, LLC 
+attorney
+
+// finance : 2014-03-20 Cotton Cypress, LLC 
+finance
+
+// investments : 2014-03-20 Holly Glen, LLC 
+investments
+
+// juegos : 2014-03-20 Uniregistry, Corp. 
+juegos
+
+// dentist : 2014-03-20 Outer Lake, LLC 
+dentist
+
+// lds : 2014-03-20 IRI Domain Management, LLC 
+lds
+
+// lawyer : 2014-03-20 Atomic Station, LLC 
+lawyer
+
+// surgery : 2014-03-20 Tin Avenue, LLC 
+surgery
+
+// gratis : 2014-03-20 Pioneer Tigers, LLC 
+gratis
+
+// software : 2014-03-20 Over Birch, LLC 
+software
+
+// mortgage : 2014-03-20 Outer Gardens, LLC 
+mortgage
+
+// republican : 2014-03-20 United TLD Holdco Ltd. 
+republican
+
+// credit : 2014-03-20 Snow Shadow, LLC 
+credit
+
+// tax : 2014-03-20 Storm Orchard, LLC 
+tax
+
+// africa : 2014-03-24 ZA Central Registry NPC trading as Registry.Africa 
+africa
+
+// joburg : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry 
+joburg
+
+// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry 
+durban
+
+// capetown : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry 
+capetown
+
+// sap : 2014-03-27 SAP AG 
+sap
+
+// datsun : 2014-03-27 NISSAN MOTOR CO., LTD. 
+datsun
+
+// infiniti : 2014-03-27 NISSAN MOTOR CO., LTD. 
+infiniti
+
+// firmdale : 2014-03-27 Firmdale Holdings Limited 
+firmdale
+
+// organic : 2014-03-27 Afilias Limited 
+organic
+
+// nissan : 2014-03-27 NISSAN MOTOR CO., LTD. 
+nissan
+
+// website : 2014-04-03 DotWebsite Inc. 
+website
+
+// space : 2014-04-03 DotSpace Inc. 
+space
+
+// schmidt : 2014-04-03 SALM S.A.S. 
+schmidt
+
+// cuisinella : 2014-04-03 SALM S.A.S. 
+cuisinella
+
+// samsung : 2014-04-03 SAMSUNG SDS CO., LTD 
+samsung
+
+// crs : 2014-04-03 Federated Co operatives Limited 
+crs
+
+// doosan : 2014-04-03 Doosan Corporation 
+doosan
+
+// press : 2014-04-03 DotPress Inc. 
+press
+
+// emerck : 2014-04-03 Merck KGaA 
+emerck
+
+// erni : 2014-04-03 ERNI Group Holding AG 
+erni
+
+// direct : 2014-04-10 Half Trail, LLC 
+direct
+
+// yandex : 2014-04-10 YANDEX, LLC 
+yandex
+
+// lotto : 2014-04-10 Afilias Limited 
+lotto
+
+// toshiba : 2014-04-10 TOSHIBA Corporation 
+toshiba
+
+// bauhaus : 2014-04-17 Werkhaus GmbH 
+bauhaus
+
+// host : 2014-04-17 DotHost Inc. 
+host
+
+// ltda : 2014-04-17 DOMAIN ROBOT SERVICOS DE HOSPEDAGEM NA INTERNET LTDA 
+ltda
+
+// global : 2014-04-17 Dot GLOBAL AS 
+global
+
+// abogado : 2014-04-24 Top Level Domain Holdings Limited 
+abogado
+
+// place : 2014-04-24 Snow Galley, LLC 
+place
+
+// tirol : 2014-04-24 punkt Tirol GmbH 
+tirol
+
+// gmx : 2014-04-24 1&1 Mail & Media GmbH 
+gmx
+
+// tatar : 2014-04-24 Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic" 
+tatar
+
+// scholarships : 2014-04-24 Scholarships.com, LLC 
+scholarships
+
+// eurovision : 2014-04-24 European Broadcasting Union (EBU) 
+eurovision
+
+// wedding : 2014-04-24 Top Level Domain Holdings Limited 
+wedding
+
+// active : 2014-05-01 The Active Network, Inc 
+active
+
+// madrid : 2014-05-01 Comunidad de Madrid 
+madrid
+
+// youtube : 2014-05-01 Charleston Road Registry Inc. 
+youtube
+
+// sharp : 2014-05-01 Sharp Corporation 
+sharp
+
+// uol : 2014-05-01 UBN INTERNET LTDA. 
+uol
+
+// physio : 2014-05-01 PhysBiz Pty Ltd 
+physio
+
+// gmail : 2014-05-01 Charleston Road Registry Inc. 
+gmail
+
+// channel : 2014-05-08 Charleston Road Registry Inc. 
+channel
+
+// fly : 2014-05-08 Charleston Road Registry Inc. 
+fly
+
+// zip : 2014-05-08 Charleston Road Registry Inc. 
+zip
+
+// esq : 2014-05-08 Charleston Road Registry Inc. 
+esq
+
+// rsvp : 2014-05-08 Charleston Road Registry Inc. 
+rsvp
+
+// wales : 2014-05-08 Nominet UK 
+wales
+
+// cymru : 2014-05-08 Nominet UK 
+cymru
+
+// green : 2014-05-08 Afilias Limited 
+green
+
+// lgbt : 2014-05-08 Afilias Limited 
+lgbt
+
+// xn--hxt814e : 2014-05-15 Zodiac Libra Limited 
+网店
+
+// cancerresearch : 2014-05-15 Australian Cancer Research Foundation 
+cancerresearch
+
+// everbank : 2014-05-15 EverBank 
+everbank
+
+// frl : 2014-05-15 FRLregistry B.V. 
+frl
+
+// property : 2014-05-22 Uniregistry, Corp. 
+property
+
+// forsale : 2014-05-22 Sea Oaks, LLC 
+forsale
+
+// seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal) 
+seat
+
+// deals : 2014-05-22 Sand Sunset, LLC 
+deals
+
+// nra : 2014-05-22 NRA Holdings Company, INC. 
+nra
+
+// xn--fjq720a : 2014-05-22 Will Bloom, LLC 
+娱乐
+
+// realtor : 2014-05-29 Real Estate Domains LLC 
+realtor
+
+// bnpparibas : 2014-05-29 BNP Paribas 
+bnpparibas
+
+// melbourne : 2014-05-29 The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation 
+melbourne
+
+// hosting : 2014-05-29 Uniregistry, Corp. 
+hosting
+
+// yoga : 2014-05-29 Top Level Domain Holdings Limited 
+yoga
+
+// city : 2014-05-29 Snow Sky, LLC 
+city
+
+// bond : 2014-06-05 Bond University Limited 
+bond
+
+// click : 2014-06-05 Uniregistry, Corp. 
+click
+
+// cern : 2014-06-05 European Organization for Nuclear Research ("CERN") 
+cern
 
 // ===END ICANN DOMAINS===
 // ===BEGIN PRIVATE DOMAINS===
 
 // Amazon CloudFront : https://aws.amazon.com/cloudfront/
 // Submitted by Donavan Miller <donavanm@amazon.com> 2013-03-22
 cloudfront.net
 
 // Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/
-// Submitted by Osman Surkatty <osmans@amazon.com> 2013-04-02
-compute.amazonaws.com
-us-east-1.amazonaws.com
-compute-1.amazonaws.com
-z-1.compute-1.amazonaws.com
-z-2.compute-1.amazonaws.com
+// Submitted by Osman Surkatty <osmans@amazon.com> 2014-05-20
 ap-northeast-1.compute.amazonaws.com
 ap-southeast-1.compute.amazonaws.com
 ap-southeast-2.compute.amazonaws.com
+cn-north-1.compute.amazonaws.cn
+compute.amazonaws.cn
+compute.amazonaws.com
+compute-1.amazonaws.com
 eu-west-1.compute.amazonaws.com
 sa-east-1.compute.amazonaws.com
+us-east-1.amazonaws.com
 us-gov-west-1.compute.amazonaws.com
 us-west-1.compute.amazonaws.com
 us-west-2.compute.amazonaws.com
+z-1.compute-1.amazonaws.com
+z-2.compute-1.amazonaws.com
 
 // Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/
 // Submitted by Adam Stein <astein@amazon.com> 2013-04-02
 elasticbeanstalk.com
 
 // Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/
 // Submitted by Scott Vidmar <svidmar@amazon.com> 2013-03-27
 elb.amazonaws.com
@@ -7714,16 +8049,17 @@ betainabox.com
 
 // CentralNic : http://www.centralnic.com/names/domains
 // Submitted by registry <gavin.brown@centralnic.com> 2012-09-27
 ae.org
 ar.com
 br.com
 cn.com
 com.de
+com.se
 de.com
 eu.com
 gb.com
 gb.net
 hu.com
 hu.net
 jp.net
 jpn.com
@@ -8069,16 +8405,20 @@ writesthisblog.com
 // Fastly Inc. http://www.fastly.com/
 // Submitted by Vladimir Vuksan <vladimir@fastly.com> 2013-05-31
 a.ssl.fastly.net
 b.ssl.fastly.net
 global.ssl.fastly.net
 a.prod.fastly.net
 global.prod.fastly.net
 
+// Firebase, Inc.
+// Submitted by Chris Raynor <chris@firebase.com> 2014-01-21
+firebaseapp.com
+
 // GitHub, Inc.
 // Submitted by Ben Toews <btoews@github.com> 2014-02-06
 github.io
 githubusercontent.com
 
 // GlobeHosting, Inc.
 // Submitted by Zoltan Egresi <egresi@globehosting.com> 2013-07-12
 ro.com
@@ -8148,20 +8488,28 @@ info.at
 co.pl
 
 // Microsoft : http://microsoft.com
 // Submitted by Barry Dorrans <bdorrans@microsoft.com> 2014-01-24
 azurewebsites.net
 azure-mobile.net
 cloudapp.net
 
+// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
+// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net> 2014-02-02
+nfshost.com
+
 // NYC.mn : http://www.information.nyc.mn
 // Submitted by Matthew Brown <mattbrown@nyc.mn> 2013-03-11
 nyc.mn
 
+// One Fold Media : http://www.onefoldmedia.com/
+// Submitted by Eddie Jones <eddie@onefoldmedia.com> 2014-06-10
+nid.io
+
 // Opera Software, A.S.A.
 // Submitted by Yngve Pettersen <yngve@opera.com> 2009-11-26
 operaunite.com
 
 // OutSystems
 // Submitted by Duarte Santos <domain-admin@outsystemscloud.com> 2014-03-11
 outsystemscloud.com