summaryrefslogtreecommitdiff
path: root/chromium/net/base
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-12 11:40:13 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-05-12 09:52:12 +0000
commit980b784afe75be22158126ac6a639c19459d3427 (patch)
treecc9111d7faa5042ad860237f5c5ec88ce4bd987c /chromium/net/base
parent2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (diff)
downloadqtwebengine-chromium-980b784afe75be22158126ac6a639c19459d3427.tar.gz
BASELINE: Update Chromium to 51.0.2704.47
And adds in a few missing files. Change-Id: Id0d85c81f5efc1b1c8cf9cb3241da26bf7245026 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'chromium/net/base')
-rw-r--r--chromium/net/base/registry_controlled_domains/effective_tld_names.dat92
-rw-r--r--chromium/net/base/registry_controlled_domains/effective_tld_names.gperf34
2 files changed, 119 insertions, 7 deletions
diff --git a/chromium/net/base/registry_controlled_domains/effective_tld_names.dat b/chromium/net/base/registry_controlled_domains/effective_tld_names.dat
index 257e750d29f..39db97a8773 100644
--- a/chromium/net/base/registry_controlled_domains/effective_tld_names.dat
+++ b/chromium/net/base/registry_controlled_domains/effective_tld_names.dat
@@ -6932,14 +6932,26 @@ school.za
tm.za
web.za
-// zm : https://en.wikipedia.org/wiki/.zm
-*.zm
+// zm : https://zicta.zm/
+// Submitted by registry <info@zicta.zm>
+zm
+ac.zm
+biz.zm
+co.zm
+com.zm
+edu.zm
+gov.zm
+info.zm
+mil.zm
+net.zm
+org.zm
+sch.zm
// zw : https://en.wikipedia.org/wiki/.zw
*.zw
-// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2016-04-04T20:12:16Z
+// List of new gTLDs imported from https://newgtlds.icann.org/newgtlds.csv on 2016-05-09T22:17:27Z
// aaa : 2015-02-26 American Automobile Association, Inc.
aaa
@@ -7421,6 +7433,9 @@ call
// calvinklein : 2015-07-30 PVH gTLD Holdings LLC
calvinklein
+// cam : 2016-04-21 AC Webconnecting Holding B.V.
+cam
+
// camera : 2013-08-27 Atomic Maple, LLC
camera
@@ -7856,7 +7871,7 @@ dunlop
// duns : 2015-08-06 The Dun & Bradstreet Corporation
duns
-// dupont : 2015-06-25 E.I. du Pont de Nemours and Company
+// dupont : 2015-06-25 E. I. du Pont de Nemours and Company
dupont
// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
@@ -8066,6 +8081,9 @@ fly
// foo : 2014-01-23 Charleston Road Registry Inc.
foo
+// food : 2016-04-21 Lifestyle Domain Holdings, Inc.
+food
+
// foodnetwork : 2015-07-02 Lifestyle Domain Holdings, Inc.
foodnetwork
@@ -8387,6 +8405,9 @@ hot
// hoteles : 2015-03-05 Travel Reservations SRL
hoteles
+// hotels : 2016-04-07 Booking.com B.V.
+hotels
+
// hotmail : 2014-12-18 Microsoft Corporation
hotmail
@@ -8525,7 +8546,7 @@ jcp
// jeep : 2015-07-30 FCA US LLC.
jeep
-// jetzt : 2014-01-09 New TLD Company AB
+// jetzt : 2014-01-09
jetzt
// jewelry : 2015-03-05 Wild Bloom, LLC
@@ -9665,7 +9686,10 @@ shiksha
// shoes : 2013-10-02 Binky Galley, LLC
shoes
-// shopping : 2016-03-31 Uniregistry, Corp.
+// shop : 2016-04-08 GMO Registry, Inc.
+shop
+
+// shopping : 2016-03-31
shopping
// shouji : 2015-01-08 QIHOO 360 TECHNOLOGY CO. LTD.
@@ -10612,6 +10636,11 @@ zuerich
// ===BEGIN PRIVATE DOMAINS===
// (Note: these are in alphabetical order by company name)
+// Alces Software Ltd : http://alces-software.com
+// Submitted by Mark J. Titorenko <mark.titorenko@alces-software.com>
+*.compute.estate
+*.alces.network
+
// Amazon CloudFront : https://aws.amazon.com/cloudfront/
// Submitted by Donavan Miller <donavanm@amazon.com>
cloudfront.net
@@ -10664,6 +10693,14 @@ s3.ap-northeast-2.amazonaws.com
s3.cn-north-1.amazonaws.com.cn
s3.eu-central-1.amazonaws.com
+// Aptible : https://www.aptible.com/
+// Submitted by Thomas Orozco <thomas@aptible.com>
+on-aptible.com
+
+// AVM : https://avm.de
+// Submitted by Andreas Weise <a.weise@avm.de>
+myfritz.net
+
// BetaInABox
// Submitted by Adrian <adrian@betainabox.com>
betainabox.com
@@ -10764,6 +10801,10 @@ cupcake.is
cyon.link
cyon.site
+// Daplie, Inc : https://daplie.com
+// Submitted by AJ ONeal <aj@daplie.com>
+daplie.me
+
// Dansk.net : http://www.dansk.net/
// Submitted by Anani Voule <digital@digital.co.dk>
biz.dk
@@ -10772,6 +10813,14 @@ firm.dk
reg.dk
store.dk
+// deSEC : https://desec.io/
+// Submitted by Peter Thomassen <peter@desec.io>
+dedyn.io
+
+// DNShome : https://www.dnshome.de/
+// Submitted by Norbert Auler <mail@dnshome.de>
+dnshome.de
+
// DreamHost : http://www.dreamhost.com/
// Submitted by Andrew Farmer <andrew.farmer@dreamhost.com>
dreamhosters.com
@@ -11166,8 +11215,13 @@ gist.githubcloud.com
// Submitted by Zoltan Egresi <egresi@globehosting.com>
ro.com
+// GoIP DNS Services : http://www.goip.de
+// Submitted by Christian Poulter <milchstrasse@goip.de>
+goip.de
+
// Google, Inc.
// Submitted by Eduardo Vela <evn@google.com>
+*.0emm.com
appspot.com
blogspot.ae
blogspot.al
@@ -11292,6 +11346,11 @@ ngrok.io
// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
nfshost.com
+// nsupdate.info : https://www.nsupdate.info/
+// Submitted by Thomas Waldmann <info@nsupdate.info>
+nsupdate.info
+nerdpol.ovh
+
// NYC.mn : http://www.information.nyc.mn
// Submitted by Matthew Brown <mattbrown@nyc.mn>
nyc.mn
@@ -11308,6 +11367,10 @@ operaunite.com
// Submitted by Duarte Santos <domain-admin@outsystemscloud.com>
outsystemscloud.com
+// OwnProvider : http://www.ownprovider.com
+// Submitted by Jan Moennich <jan.moennich@ownprovider.com>
+ownprovider.com
+
// oy.lc
// Submitted by Charly Coste <changaco@changaco.oy.lc>
oy.lc
@@ -11341,6 +11404,10 @@ xen.prgmr.com
// Submitted by registry <lendl@nic.at>
priv.at
+// Publication Presse Communication SARL : https://ppcom.fr
+// Submitted by Yaacov Akiba Slama <admin@chirurgiens-dentistes-en-france.fr>
+chirurgiens-dentistes-en-france.fr
+
// QA2
// Submitted by Daniel Dent (https://www.danieldent.com/)
qa2.com
@@ -11354,6 +11421,10 @@ rackmaze.net
// Submitted by Tim Kramer <tkramer@rhcloud.com>
rhcloud.com
+// RethinkDB : https://www.rethinkdb.com/
+// Submitted by Chris Kastorff <info@rethinkdb.com>
+hzc.io
+
// Sandstorm Development Group, Inc. : https://sandcats.io/
// Submitted by Asheesh Laroia <asheesh@sandstorm.io>
sandcats.io
@@ -11393,6 +11464,11 @@ gdynia.pl
med.pl
sopot.pl
+// TownNews.com domains : http://www.townnews.com
+// Submitted by Dustin Ward <dward@townnews.com>
+bloxcms.com
+townnews-staging.com
+
// UDR Limited : http://www.udr.hk.com
// Submitted by registry <hostmaster@udr.hk.com>
hk.com
@@ -11400,6 +11476,10 @@ hk.org
ltd.hk
inc.hk
+// Viprinet Europe GmbH : http://www.viprinet.com
+// Submitted by Simon Kissel <hostmaster@viprinet.com>
+router.management
+
// Yola : https://www.yola.com/
// Submitted by Stefano Rivera <stefano@yola.com>
yolasite.com
diff --git a/chromium/net/base/registry_controlled_domains/effective_tld_names.gperf b/chromium/net/base/registry_controlled_domains/effective_tld_names.gperf
index 7a60e300488..e2901fcbfae 100644
--- a/chromium/net/base/registry_controlled_domains/effective_tld_names.gperf
+++ b/chromium/net/base/registry_controlled_domains/effective_tld_names.gperf
@@ -12,6 +12,7 @@ struct DomainRule {
};
%%
0.bg, 0
+0emm.com, 6
1.bg, 0
1kapp.com, 4
2.bg, 0
@@ -87,6 +88,7 @@ ac.ug, 0
ac.uk, 0
ac.vn, 0
ac.za, 0
+ac.zm, 0
aca.pro, 0
academy, 0
academy.museum, 0
@@ -203,6 +205,7 @@ alabama.museum, 0
alaheadju.no, 0
aland.fi, 0
alaska.museum, 0
+alces.network, 6
alessandria.it, 0
alesund.no, 0
alfaromeo, 0
@@ -632,6 +635,7 @@ biz.tr, 0
biz.tt, 0
biz.ua, 4
biz.vn, 0
+biz.zm, 0
bizen.okayama.jp, 0
bj, 0
bj.cn, 0
@@ -724,6 +728,7 @@ blogspot.tw, 4
blogspot.ug, 4
blogspot.vn, 4
bloomberg, 0
+bloxcms.com, 4
blue, 0
bm, 0
bmd.br, 0
@@ -856,6 +861,7 @@ california.museum, 0
call, 0
caltanissetta.it, 0
calvinklein, 0
+cam, 0
cam.it, 0
cambridge.museum, 0
camera, 0
@@ -1029,6 +1035,7 @@ chino.nagano.jp, 0
chintai, 0
chippubetsu.hokkaido.jp, 0
chiropractic.museum, 0
+chirurgiens-dentistes-en-france.fr, 4
chirurgiens-dentistes.fr, 0
chiryu.aichi.jp, 0
chita.aichi.jp, 0
@@ -1181,6 +1188,7 @@ co.uz, 0
co.ve, 0
co.vi, 0
co.za, 0
+co.zm, 0
coach, 0
coal.museum, 0
coastaldefence.museum, 0
@@ -1327,6 +1335,7 @@ com.vi, 0
com.vn, 0
com.vu, 0
com.ws, 0
+com.zm, 0
comcast, 0
commbank, 0
communication.museum, 0
@@ -1339,6 +1348,7 @@ compare, 0
compute-1.amazonaws.com, 4
compute.amazonaws.cn, 4
compute.amazonaws.com, 4
+compute.estate, 6
computer, 0
computer.museum, 0
computerhistory.museum, 0
@@ -1446,6 +1456,7 @@ daiwa.hiroshima.jp, 0
dali.museum, 0
dallas.museum, 0
dance, 0
+daplie.me, 4
database.museum, 0
date, 0
date.fukushima.jp, 0
@@ -1469,6 +1480,7 @@ dealer, 0
deals, 0
deatnu.no, 0
decorativearts.museum, 0
+dedyn.io, 4
defense.tn, 0
degree, 0
delaware.museum, 0
@@ -1525,6 +1537,7 @@ dnsalias.org, 4
dnsdojo.com, 4
dnsdojo.net, 4
dnsdojo.org, 4
+dnshome.de, 4
do, 0
docs, 0
dodge, 0
@@ -1744,6 +1757,7 @@ edu.vn, 0
edu.vu, 0
edu.ws, 0
edu.za, 0
+edu.zm, 0
education, 0
education.museum, 0
educational.museum, 0
@@ -1986,6 +2000,7 @@ foggia.it, 0
folkebibl.no, 0
folldal.no, 0
foo, 0
+food, 0
foodnetwork, 0
football, 0
for-better.biz, 4
@@ -2312,6 +2327,7 @@ gob.ve, 0
gobo.wakayama.jp, 0
godaddy, 0
godo.gifu.jp, 0
+goip.de, 4
gojome.akita.jp, 0
gok.pk, 0
gokase.miyazaki.jp, 0
@@ -2472,6 +2488,7 @@ gov.ve, 0
gov.vn, 0
gov.ws, 0
gov.za, 0
+gov.zm, 0
government.aero, 0
govt.nz, 0
gp, 0
@@ -2818,6 +2835,7 @@ hotel.hu, 0
hotel.lk, 0
hotel.tz, 0
hoteles, 0
+hotels, 0
hotmail, 0
house, 0
house.museum, 0
@@ -2845,6 +2863,7 @@ hyllestad.no, 0
hyogo.jp, 0
hyuga.miyazaki.jp, 0
hyundai, 0
+hzc.io, 4
i.bg, 0
i.ng, 0
i.ph, 0
@@ -2999,6 +3018,7 @@ info.tt, 0
info.tz, 0
info.ve, 0
info.vn, 0
+info.zm, 0
ing, 0
ing.pa, 0
ingatlan.hu, 0
@@ -4257,6 +4277,7 @@ mil.uy, 0
mil.vc, 0
mil.ve, 0
mil.za, 0
+mil.zm, 0
milan.it, 0
milano.it, 0
military.museum, 0
@@ -4504,6 +4525,7 @@ my.eu.org, 4
my.id, 0
mydrobo.com, 4
myds.me, 4
+myfritz.net, 4
mykolaiv.ua, 0
myoko.niigata.jp, 0
mypep.link, 4
@@ -4666,6 +4688,7 @@ nebraska.museum, 0
nec, 0
nedre-eiker.no, 0
nemuro.hokkaido.jp, 0
+nerdpol.ovh, 4
nerima.tokyo.jp, 0
nes.akershus.no, 0
nes.buskerud.no, 0
@@ -4799,6 +4822,7 @@ net.vn, 0
net.vu, 0
net.ws, 0
net.za, 0
+net.zm, 0
netbank, 0
netflix, 0
network, 0
@@ -4965,6 +4989,7 @@ nrw.museum, 0
ns.ca, 0
nsk.ru, 0
nsn.us, 0
+nsupdate.info, 4
nsw.au, 0
nsw.edu.au, 0
nt.au, 0
@@ -5112,6 +5137,7 @@ omotego.fukushima.jp, 0
omsk.ru, 0
omura.nagasaki.jp, 0
omuta.fukuoka.jp, 0
+on-aptible.com, 4
on-the-web.tv, 4
on.ca, 0
onagawa.miyagi.jp, 0
@@ -5301,6 +5327,7 @@ org.vn, 0
org.vu, 0
org.ws, 0
org.za, 0
+org.zm, 0
organic, 0
orientexpress, 0
origins, 0
@@ -5366,6 +5393,7 @@ ovh, 0
ovre-eiker.no, 0
owani.aomori.jp, 0
owariasahi.aichi.jp, 0
+ownprovider.com, 4
oxford.museum, 0
oy.lc, 4
oyabe.toyama.jp, 0
@@ -5790,6 +5818,7 @@ room, 0
roros.no, 0
rost.no, 0
rotorcraft.aero, 0
+router.management, 4
rovigo.it, 0
rovno.ua, 0
royken.no, 0
@@ -5980,6 +6009,7 @@ sch.ng, 0
sch.qa, 0
sch.sa, 0
sch.uk, 2
+sch.zm, 0
schaeffler, 0
schlesisches.museum, 0
schmidt, 0
@@ -6185,6 +6215,7 @@ shoes, 0
shonai.fukuoka.jp, 0
shonai.yamagata.jp, 0
shoo.okayama.jp, 0
+shop, 0
shop.ht, 0
shop.hu, 0
shop.pl, 0
@@ -6749,6 +6780,7 @@ tours, 0
towada.aomori.jp, 0
town, 0
town.museum, 0
+townnews-staging.com, 4
toya.hokkaido.jp, 0
toyako.hokkaido.jp, 0
toyama.jp, 0
@@ -7870,7 +7902,7 @@ zip, 0
zippo, 0
zj.cn, 0
zlg.br, 0
-zm, 2
+zm, 0
zone, 0
zoological.museum, 0
zoology.museum, 0