- tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 1033340 - uplift PSL changes to ESR 24, r=gerv, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 55559aca8b98a3a4bf49705f3eeba3630f970f71 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Tue Jul 8 15:02:49 2014 +0100 Bug 1033340 - uplift PSL changes to ESR 24, r=gerv, a=lsblakk --- netwerk/dns/effective_tld_names.dat | 2435 ++++++++++++++++++++++++++++------- netwerk/test/unit/data/test_psl.txt | 32 +- netwerk/test/unit/test_psl.js | 11 +- 3 files changed, 2008 insertions(+), 470 deletions(-) diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index ed1123b..c83fe0b 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -175,20 +175,21 @@ it.ao // aq : http://en.wikipedia.org/wiki/.aq aq -// ar : http://en.wikipedia.org/wiki/.ar -*.ar -!congresodelalengua3.ar -!educ.ar -!gobiernoelectronico.ar -!mecon.ar -!nacion.ar -!nic.ar -!promocion.ar -!retina.ar -!uba.ar +// 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(a)icann.org> 2008-06-18 +arpa e164.arpa in-addr.arpa ip6.arpa @@ -213,6 +214,7 @@ or.at // au : http://en.wikipedia.org/wiki/.au // http://www.auda.org.au/ +au // 2LDs com.au net.au @@ -243,10 +245,9 @@ sa.edu.au tas.edu.au vic.edu.au wa.edu.au -act.gov.au -// Removed at request of Shae.Donelan(a)services.nsw.gov.au, 2010-03-04 -// nsw.gov.au -nt.gov.au +// act.gov.au Bug 984824 - Removed at request of Greg Tankard +// nsw.gov.au Bug 547985 - Removed at request of <Shae.Donelan(a)services.nsw.gov.au> +// nt.gov.au Bug 940478 - Removed at request of Greg Connors <Greg.Connors(a)nt.gov.au> qld.gov.au sa.gov.au tas.gov.au @@ -291,6 +292,7 @@ rs.ba // bb : http://en.wikipedia.org/wiki/.bb bb biz.bb +co.bb com.bb edu.bb gov.bb @@ -298,6 +300,7 @@ info.bb net.bb org.bb store.bb +tv.bb // bd : http://en.wikipedia.org/wiki/.bd *.bd @@ -349,7 +352,7 @@ z.bg 6.bg 7.bg 8.bg -9.bg +9.bg // bh : http://en.wikipedia.org/wiki/.bh bh @@ -400,8 +403,8 @@ net.bo mil.bo tv.bo -// br : http://registro.br/dominio/dpn.html -// Updated by registry <fneves(a)registro.br> 2011-03-01 +// br : http://registro.br/dominio/categoria.html +// Submitted by registry <fneves(a)registro.br> 2014-03-04 br adm.br adv.br @@ -446,6 +449,7 @@ lel.br mat.br med.br mil.br +mp.br mus.br net.br nom.br @@ -491,6 +495,7 @@ org.bt // bv : No registrations at this time. // Submitted by registry <jarle(a)uninett.no> 2006-06-16 +bv // bw : http://en.wikipedia.org/wiki/.bw // http://www.gobin.info/domainname/bw.doc @@ -593,9 +598,12 @@ 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(a)cnnic.cn> 2008-06-11 @@ -787,7 +795,7 @@ org.ee fie.ee // eg : http://en.wikipedia.org/wiki/.eg -eg +eg com.eg edu.eg eun.eg @@ -810,7 +818,14 @@ gob.es edu.es // et : http://en.wikipedia.org/wiki/.et -*.et +et +com.et +gov.et +org.et +edu.et +biz.et +name.et +info.et // eu : http://en.wikipedia.org/wiki/.eu eu @@ -869,6 +884,7 @@ ga // gb : This registry is effectively dormant // Submitted by registry <Damien.Shaw(a)ja.net> 2008-06-12 +gb // gd : http://en.wikipedia.org/wiki/.gd gd @@ -886,13 +902,12 @@ pvt.ge // gf : http://en.wikipedia.org/wiki/.gf gf -// gg : http://www.channelisles.net/applic/avextn.shtml +// gg : http://www.channelisles.net/register-domains/ +// Confirmed by registry <nigel(a)channelisles.net> 2013-11-28 gg co.gg -org.gg net.gg -sch.gg -gov.gg +org.gg // gh : http://en.wikipedia.org/wiki/.gh // see also: http://www.nic.gh/reg_now.php @@ -923,6 +938,7 @@ gm // gn : http://psg.com/dns/gn/gn.txt // Submitted by registry <randy(a)psg.com> 2008-06-17 +gn ac.gn com.gn edu.gn @@ -1003,7 +1019,7 @@ org.hk 网絡.hk 组织.hk 組織.hk -組织.hk +組织.hk // hm : http://en.wikipedia.org/wiki/.hm hm @@ -1084,6 +1100,7 @@ id ac.id biz.id co.id +desa.id go.id mil.id my.id @@ -1099,16 +1116,18 @@ gov.ie // il : http://en.wikipedia.org/wiki/.il *.il -// im : https://www.nic.im/pdfs/imfaqs.pdf +// im : https://www.nic.im/ +// Submitted by registry <info(a)nic.im> 2013-11-15 im +ac.im co.im +com.im ltd.co.im -plc.co.im net.im -gov.im org.im -nic.im -ac.im +plc.co.im +tt.im +tv.im // in : http://en.wikipedia.org/wiki/.in // see also: http://www.inregistry.in/policies/ @@ -1180,294 +1199,385 @@ int.is it gov.it edu.it -// list of reserved geo-names : +// Reserved geo-names: // http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazi… -// (There is also a list of reserved geo-names corresponding to Italian -// municipalities : http://www.nic.it/documenti/appendice-c.pdf , but it is -// not included here.) -agrigento.it +// There is also a list of reserved geo-names corresponding to Italian municipalities +// http://www.nic.it/documenti/appendice-c.pdf, but it is not included here. +// Regions +abr.it +abruzzo.it +aosta-valley.it +aostavalley.it +bas.it +basilicata.it +cal.it +calabria.it +cam.it +campania.it +emilia-romagna.it +emiliaromagna.it +emr.it +friuli-v-giulia.it +friuli-ve-giulia.it +friuli-vegiulia.it +friuli-venezia-giulia.it +friuli-veneziagiulia.it +friuli-vgiulia.it +friuliv-giulia.it +friulive-giulia.it +friulivegiulia.it +friulivenezia-giulia.it +friuliveneziagiulia.it +friulivgiulia.it +fvg.it +laz.it +lazio.it +lig.it +liguria.it +lom.it +lombardia.it +lombardy.it +lucania.it +mar.it +marche.it +mol.it +molise.it +piedmont.it +piemonte.it +pmn.it +pug.it +puglia.it +sar.it +sardegna.it +sardinia.it +sic.it +sicilia.it +sicily.it +taa.it +tos.it +toscana.it +trentino-a-adige.it +trentino-aadige.it +trentino-alto-adige.it +trentino-altoadige.it +trentino-s-tirol.it +trentino-stirol.it +trentino-sud-tirol.it +trentino-sudtirol.it +trentino-sued-tirol.it +trentino-suedtirol.it +trentinoa-adige.it +trentinoaadige.it +trentinoalto-adige.it +trentinoaltoadige.it +trentinos-tirol.it +trentinostirol.it +trentinosud-tirol.it +trentinosudtirol.it +trentinosued-tirol.it +trentinosuedtirol.it +tuscany.it +umb.it +umbria.it +val-d-aosta.it +val-daosta.it +vald-aosta.it +valdaosta.it +valle-aosta.it +valle-d-aosta.it +valle-daosta.it +valleaosta.it +valled-aosta.it +valledaosta.it +vallee-aoste.it +valleeaoste.it +vao.it +vda.it +ven.it +veneto.it +// Provinces ag.it -alessandria.it +agrigento.it al.it -ancona.it +alessandria.it +alto-adige.it +altoadige.it an.it +ancona.it +andria-barletta-trani.it +andria-trani-barletta.it +andriabarlettatrani.it +andriatranibarletta.it +ao.it aosta.it aoste.it -ao.it -arezzo.it +ap.it +aq.it +aquila.it ar.it +arezzo.it ascoli-piceno.it ascolipiceno.it -ap.it asti.it at.it -avellino.it av.it -bari.it +avellino.it ba.it -andria-barletta-trani.it -andriabarlettatrani.it -trani-barletta-andria.it -tranibarlettaandria.it +balsan.it +bari.it barletta-trani-andria.it barlettatraniandria.it -andria-trani-barletta.it -andriatranibarletta.it -trani-andria-barletta.it -traniandriabarletta.it -bt.it belluno.it -bl.it benevento.it -bn.it bergamo.it bg.it -biella.it bi.it -bologna.it +biella.it +bl.it +bn.it bo.it +bologna.it bolzano.it bozen.it -balsan.it -alto-adige.it -altoadige.it -suedtirol.it -bz.it +br.it brescia.it -bs.it brindisi.it -br.it -cagliari.it +bs.it +bt.it +bz.it ca.it +cagliari.it caltanissetta.it -cl.it +campidano-medio.it +campidanomedio.it campobasso.it -cb.it -carboniaiglesias.it carbonia-iglesias.it -iglesias-carbonia.it -iglesiascarbonia.it -ci.it +carboniaiglesias.it +carrara-massa.it +carraramassa.it caserta.it -ce.it catania.it -ct.it catanzaro.it -cz.it -chieti.it +cb.it +ce.it +cesena-forli.it +cesenaforli.it ch.it -como.it +chieti.it +ci.it +cl.it +cn.it co.it +como.it cosenza.it -cs.it -cremona.it cr.it +cremona.it crotone.it -kr.it +cs.it +ct.it cuneo.it -cn.it +cz.it dell-ogliastra.it dellogliastra.it -ogliastra.it -og.it -enna.it en.it -ferrara.it +enna.it +fc.it fe.it fermo.it -fm.it +ferrara.it +fg.it +fi.it firenze.it florence.it -fi.it +fm.it foggia.it -fg.it forli-cesena.it forlicesena.it -cesena-forli.it -cesenaforli.it -fc.it -frosinone.it fr.it -genova.it -genoa.it +frosinone.it ge.it -gorizia.it +genoa.it +genova.it go.it -grosseto.it +gorizia.it gr.it -imperia.it +grosseto.it +iglesias-carbonia.it +iglesiascarbonia.it im.it -isernia.it +imperia.it is.it -laquila.it -aquila.it -aq.it +isernia.it +kr.it la-spezia.it +laquila.it laspezia.it -sp.it latina.it -lt.it -lecce.it +lc.it le.it +lecce.it lecco.it -lc.it -livorno.it li.it -lodi.it +livorno.it lo.it -lucca.it +lodi.it +lt.it lu.it +lucca.it macerata.it -mc.it mantova.it -mn.it massa-carrara.it massacarrara.it -carrara-massa.it -carraramassa.it -ms.it matera.it -mt.it +mb.it +mc.it +me.it medio-campidano.it mediocampidano.it -campidano-medio.it -campidanomedio.it -vs.it messina.it -me.it -milano.it -milan.it mi.it -modena.it +milan.it +milano.it +mn.it mo.it -monza.it +modena.it monza-brianza.it +monza-e-della-brianza.it +monza.it monzabrianza.it monzaebrianza.it monzaedellabrianza.it -monza-e-della-brianza.it -mb.it -napoli.it -naples.it +ms.it +mt.it na.it -novara.it +naples.it +napoli.it no.it -nuoro.it +novara.it nu.it -oristano.it +nuoro.it +og.it +ogliastra.it +olbia-tempio.it +olbiatempio.it or.it +oristano.it +ot.it +pa.it padova.it padua.it -pd.it palermo.it -pa.it parma.it -pr.it pavia.it -pv.it -perugia.it -pg.it -pescara.it +pc.it +pd.it pe.it +perugia.it pesaro-urbino.it pesarourbino.it -urbino-pesaro.it -urbinopesaro.it -pu.it +pescara.it +pg.it +pi.it piacenza.it -pc.it pisa.it -pi.it pistoia.it -pt.it -pordenone.it pn.it +po.it +pordenone.it potenza.it -pz.it +pr.it prato.it -po.it +pt.it +pu.it +pv.it +pz.it +ra.it ragusa.it -rg.it ravenna.it -ra.it -reggio-calabria.it -reggiocalabria.it rc.it +re.it +reggio-calabria.it reggio-emilia.it +reggiocalabria.it reggioemilia.it -re.it -rieti.it +rg.it ri.it +rieti.it rimini.it +rm.it rn.it +ro.it roma.it rome.it -rm.it rovigo.it -ro.it -salerno.it sa.it +salerno.it sassari.it -ss.it savona.it -sv.it -siena.it si.it +siena.it siracusa.it -sr.it -sondrio.it so.it -taranto.it +sondrio.it +sp.it +sr.it +ss.it +suedtirol.it +sv.it ta.it +taranto.it +te.it tempio-olbia.it tempioolbia.it -olbia-tempio.it -olbiatempio.it -ot.it teramo.it -te.it terni.it -tr.it +tn.it +to.it torino.it -turin.it -to.it -trapani.it tp.it -trento.it +tr.it +trani-andria-barletta.it +trani-barletta-andria.it +traniandriabarletta.it +tranibarlettaandria.it +trapani.it trentino.it -tn.it +trento.it treviso.it -tv.it trieste.it ts.it -udine.it +turin.it +tv.it ud.it -varese.it +udine.it +urbino-pesaro.it +urbinopesaro.it va.it +varese.it +vb.it +vc.it +ve.it venezia.it venice.it -ve.it verbania.it -vb.it vercelli.it -vc.it verona.it -vr.it +vi.it vibo-valentia.it vibovalentia.it -vv.it vicenza.it -vi.it viterbo.it +vr.it +vs.it vt.it +vv.it -// je : http://www.channelisles.net/applic/avextn.shtml +// je : http://www.channelisles.net/register-domains/ +// Confirmed by registry <nigel(a)channelisles.net> 2013-11-28 je co.je -org.je net.je -sch.je -gov.je +org.je // jm : http://www.com.jm/register.html *.jm @@ -1488,7 +1598,7 @@ jobs // jp : http://en.wikipedia.org/wiki/.jp // http://jprs.co.jp/en/jpdomain.html -// Updated by registry <info(a)jprs.jp> 2012-05-28 +// Submitted by registry <info(a)jprs.jp> 2014-02-28 jp // jp organizational type names ac.jp @@ -1592,7 +1702,6 @@ konan.aichi.jp kota.aichi.jp mihama.aichi.jp miyoshi.aichi.jp -nagakute.aichi.jp nishio.aichi.jp nisshin.aichi.jp obu.aichi.jp @@ -2264,7 +2373,6 @@ rikuzentakata.iwate.jp shiwa.iwate.jp shizukuishi.iwate.jp sumita.iwate.jp -takizawa.iwate.jp tanohata.iwate.jp tono.iwate.jp yahaba.iwate.jp @@ -3302,6 +3410,7 @@ edu.kn gov.kn // kp : http://www.kcce.kp/en_index.php +kp com.kp edu.kp gov.kp @@ -3379,6 +3488,7 @@ org.la // lb : http://en.wikipedia.org/wiki/.lb // Submitted by registry <randy(a)psg.com> 2008-06-17 +lb com.lb edu.lb gov.lb @@ -3417,6 +3527,7 @@ hotel.lk // lr : http://psg.com/dns/lr/lr.txt // Submitted by registry <randy(a)psg.com> 2008-06-17 +lr com.lr edu.lr gov.lr @@ -3559,11 +3670,21 @@ mq mr gov.mr -// ms : http://en.wikipedia.org/wiki/.ms +// ms : http://www.nic.ms/pdf/MS_Domain_Name_Rules.pdf ms - -// mt : https://www.nic.org.mt/dotmt/ -*.mt +com.ms +edu.ms +gov.ms +net.ms +org.ms + +// mt : https://www.nic.org.mt/go/policy +// Submitted by registry <help(a)nic.org.mt> 2013-11-19 +mt +com.mt +edu.mt +net.mt +org.mt // mu : http://en.wikipedia.org/wiki/.mu mu @@ -4230,13 +4351,16 @@ other.nf store.nf // ng : http://psg.com/dns/ng/ -// Submitted by registry <randy(a)psg.com> 2008-06-17 -ac.ng +ng com.ng edu.ng -gov.ng +name.ng net.ng org.ng +sch.ng +gov.ng +mil.ng +mobi.ng // ni : http://www.nic.ni/dominios.htm *.ni @@ -4252,7 +4376,7 @@ bv.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: +// announce mailing list: // https://postlister.uninett.no/sympa/info/norid-diskusjon no // Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html @@ -5034,20 +5158,36 @@ com.nr nu // nz : http://en.wikipedia.org/wiki/.nz -*.nz +// Confirmed by registry <jay(a)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 -!mediaphone.om -!nawrastelecom.om -!nawras.om -!omanmobile.om -!omanpost.om -!omantel.om -!rakpetroleum.om -!siemens.om -!songfest.om -!statecouncil.om +om +co.om +com.om +edu.om +gov.om +med.om +museum.om +net.om +org.om +pro.om // org : http://en.wikipedia.org/wiki/.org org @@ -5502,7 +5642,6 @@ oryol.ru palana.ru penza.ru perm.ru -pskov.ru ptz.ru rnd.ru ryazan.ru @@ -5622,7 +5761,7 @@ gov.sd info.sd // se : http://en.wikipedia.org/wiki/.se -// Submitted by registry <Patrik.Wallstrom(a)iis.se> 2008-06-24 +// Submitted by registry <patrik.wallstrom(a)iis.se> 2014-03-18 se a.se ac.se @@ -5656,7 +5795,6 @@ pp.se press.se r.se s.se -sshn.se t.se tm.se u.se @@ -5687,6 +5825,7 @@ si // sj : No registrations at this time. // Submitted by registry <jarle(a)uninett.no> 2008-06-16 +sj // sk : http://en.wikipedia.org/wiki/.sk // list of 2nd level domains ? @@ -5741,8 +5880,13 @@ store.st // su : http://en.wikipedia.org/wiki/.su su -// sv : http://www.svnet.org.sv/svpolicy.html -*.sv +// sv : http://www.svnet.org.sv/niveldos.pdf +sv +com.sv +edu.sv +gob.sv +org.sv +red.sv // sx : http://en.wikipedia.org/wiki/.sx // Confirmed by registry <jcvignes(a)openregistry.com> 2012-05-31 @@ -5864,6 +6008,10 @@ org.to edu.to mil.to +// tp : No registrations at this time. +// Submitted by Ryan Sleevi <ryan.sleevi(a)gmail.com> 2014-01-03 +tp + // tr : http://en.wikipedia.org/wiki/.tr *.tr !nic.tr @@ -5917,6 +6065,7 @@ club.tw // tz : http://www.tznic.or.tz/index.php/domains // Confirmed by registry <manager(a)tznic.or.tz> 2013-01-22 +tz ac.tz co.tz go.tz @@ -6029,19 +6178,19 @@ com.ug org.ug // uk : http://en.wikipedia.org/wiki/.uk -// Submitted by registry <noc(a)nominet.org.uk> 2012-10-02 -// and tweaked by us pending further consultation. -*.uk +// Submitted by registry <Michael.Daly(a)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 @@ -6125,7 +6274,7 @@ k12.de.us k12.fl.us k12.ga.us k12.gu.us -// k12.hi.us Hawaii has a state-wide DOE login: bug 614565 +// k12.hi.us Bug 614565 - Hawaii has a state-wide DOE login k12.ia.us k12.id.us k12.il.us @@ -6156,7 +6305,7 @@ k12.pa.us k12.pr.us k12.ri.us k12.sc.us -k12.sd.us +// k12.sd.us Bug 934131 - Removed at request of James Booze <James.Booze(a)k12.sd.us> k12.tn.us k12.tx.us k12.ut.us @@ -6165,7 +6314,7 @@ k12.vt.us k12.va.us k12.wa.us k12.wi.us -k12.wv.us +// k12.wv.us Bug 947705 - Removed at request of Verne Britton <verne(a)wvnet.edu> k12.wy.us cc.ak.us @@ -6277,316 +6426,1610 @@ lib.vt.us lib.va.us lib.wa.us lib.wi.us -lib.wv.us +// lib.wv.us Bug 941670 - Removed at request of Larry W Arnold <arnold(a)wvlc.lib.wv.us> lib.wy.us -// k12.ma.us contains school districts in Massachusetts. The 4LDs are -// managed indepedently except for private (PVT), charter (CHTR) and -// parochial (PAROCH) schools. Those are delegated dorectly to the -// 5LD operators. <k12-ma-hostmaster _ at _ rsuc.gweep.net> -pvt.k12.ma.us -chtr.k12.ma.us -paroch.k12.ma.us +// k12.ma.us contains school districts in Massachusetts. The 4LDs are +// managed indepedently except for private (PVT), charter (CHTR) and +// parochial (PAROCH) schools. Those are delegated dorectly to the +// 5LD operators. <k12-ma-hostmaster _ at _ rsuc.gweep.net> +pvt.k12.ma.us +chtr.k12.ma.us +paroch.k12.ma.us + +// uy : http://www.nic.org.uy/ +uy +com.uy +edu.uy +gub.uy +mil.uy +net.uy +org.uy + +// uz : http://www.reg.uz/ +uz +co.uz +com.uz +net.uz +org.uz + +// va : http://en.wikipedia.org/wiki/.va +va + +// vc : http://en.wikipedia.org/wiki/.vc +// Submitted by registry <kshah(a)ca.afilias.info> 2008-06-13 +vc +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 +// are available for registration (which they do not seem to be). +vi +co.vi +com.vi +k12.vi +net.vi +org.vi + +// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp +vn +com.vn +net.vn +org.vn +edu.vn +gov.vn +int.vn +ac.vn +biz.vn +info.vn +name.vn +pro.vn +health.vn + +// vu : http://en.wikipedia.org/wiki/.vu +// 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 +net.ws +org.ws +gov.ws +edu.ws + +// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf +yt + +// IDN ccTLDs +// Please sort by ISO 3166 ccTLD, then punicode string +// when submitting patches and follow this format: +// <Punicode> ("<english word>" <language>) : <ISO 3166 ccTLD> +// [optional sponsoring org] +// <URL> + +// xn--mgbaam7a8h ("Emerat" Arabic) : AE +// http://nic.ae/english/arabicdomain/rules.jsp +امارات + +// xn--54b7fta0cc ("Bangla" Bangla) : BD +বাংলা + +// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhongguo>) : CN +// CNNIC +// http://cnnic.cn/html/Dir/2005/10/11/3218.htm +中国 + +// xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhongguo>) : CN +// CNNIC +// http://cnnic.cn/html/Dir/2005/10/11/3218.htm +中國 + +// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ +الجزائر + +// xn--wgbh1c ("Egypt" Arabic .masr) : EG +// http://www.dotmasr.eg/ +مصر + +// xn--node ("ge" Georgian (Mkhedruli)) : GE +გე + +// xn--j6w193g ("Hong Kong" Chinese-Han) : HK +// https://www2.hkirc.hk/register/rules.jsp +香港 + +// xn--h2brj9c ("Bharat" Devanagari) : IN +// India +भारत + +// xn--mgbbh1a71e ("Bharat" Arabic) : IN +// India +بھارت + +// xn--fpcrj9c3d ("Bharat" Telugu) : IN +// India +భారత్ + +// xn--gecrj9c ("Bharat" Gujarati) : IN +// India +ભારત + +// xn--s9brj9c ("Bharat" Gurmukhi) : IN +// India +ਭਾਰਤ + +// xn--45brj9c ("Bharat" Bengali) : IN +// India +ভারত + +// xn--xkc2dl3a5ee0h ("India" Tamil) : IN +// India +இந்தியா + +// xn--mgba3a4f16a ("Iran" Persian) : IR +ایران + +// xn--mgba3a4fra ("Iran" Arabic) : IR +ايران + +// xn--mgbayh7gpa ("al-Ordon" Arabic) : JO +// National Information Technology Center (NITC) +// Royal Scientific Society, Al-Jubeiha +الاردن + +// xn--3e0b707e ("Republic of Korea" Hangul) : KR +한국 + +// xn--80ao21a ("Kaz" Kazakh) : KZ +қаз + +// xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK +// http://nic.lk +ලංකා + +// xn--xkc2al3hye2a ("Ilangai" Tamil) : LK +// http://nic.lk +இலங்கை + +// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA +المغرب + +// xn--l1acc ("mon" Mongolian) : MN +мон + +// xn--mgbx4cd0ab ("Malaysia" Malay) : MY +مليسيا + +// xn--mgb9awbf ("Oman" Arabic) : OM +عمان + +// 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/ +قطر + +// xn--mgberp4a5d4ar ("AlSaudiah" Arabic) : SA +// http://www.nic.net.sa/ +السعودية + +// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA +السعودیة + +// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA +السعودیۃ + +// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA +السعوديه + +// xn--ogbpf8fl ("Syria" Arabic) : SY +سورية + +// xn--mgbtf8fl ("Syria" Arabic) variant : SY +سوريا + +// xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG +新加坡 + +// xn--clchc0ea0b2g2a9gcd ("Singapore" Tamil) : SG +சிங்கப்பூர் + +// xn--o3cw4h ("Thai" Thai) : TH +// http://www.thnic.co.th +ไทย + +// xn--pgbs0dh ("Tunis") : TN +// http://nic.tn +تونس + +// xn--kpry57d ("Taiwan" Chinese-Han-Traditional) : TW +// http://www.twnic.net/english/dn/dn_07a.htm +台灣 + +// xn--kprw13d ("Taiwan" Chinese-Han-Simplified) : TW +// http://www.twnic.net/english/dn/dn_07a.htm +台湾 + +// xn--nnx388a ("Taiwan") variant : TW +臺灣 + +// xn--j1amh ("ukr" Cyrillic) : UA +укр + +// xn--mgb2ddes ("AlYemen" Arabic) : YE +اليمن + +// xxx : http://icmregistry.com +xxx + +// ye : http://www.y.net.ye/services/domain_name.htm +*.ye + +// za : http://www.zadna.org.za/slds.html +*.za + +// zm : http://en.wikipedia.org/wiki/.zm +*.zm + +// zw : http://en.wikipedia.org/wiki/.zw +*.zw + + +// xn--80asehdb : 2013-07-14 CORE Association +онлайн + +// xn--80aswg : 2013-07-14 CORE Association +сайт + +// xn--ngbc5azd : 2013-07-14 International Domain Registry Pty. Ltd. +شبكة + +// xn--unup4y : 2013-07-14 Spring Fields, LLC +游戏 + +// xn--vhquv : 2013-08-28 Dash McCook, LLC +企业 + +// camera : 2013-08-28 Atomic Maple, LLC +camera + +// clothing : 2013-08-28 Steel Lake, LLC +clothing + +// lighting : 2013-08-28 John McCook, LLC +lighting + +// singles : 2013-08-28 Fern Madison, LLC +singles + +// ventures : 2013-08-28 Binky Lake, LLC +ventures + +// voyage : 2013-08-28 Ruby House, LLC +voyage + +// guru : 2013-08-28 Pioneer Cypress, LLC +guru + +// holdings : 2013-08-28 John Madison, LLC +holdings + +// equipment : 2013-08-28 Corn Station, LLC +equipment + +// bike : 2013-08-28 Grand Hollow, LLC +bike + +// estate : 2013-08-28 Trixy Park, LLC +estate + +// tattoo : 2013-08-30 Uniregistry,Corp. +tattoo + +// xn--3ds443g : 2013-09-09 TLD Registry Limited +在线 + +// xn--fiq228c5hs : 2013-09-09 TLD Registry Limited +中文网 + +// land : 2013-09-10 Pine Moon, LLC +land + +// plumbing : 2013-09-10 Spring Tigers, LLC +plumbing + +// contractors : 2013-09-10 Magic Woods, LLC +contractors + +// sexy : 2013-09-11 Uniregistry,Corp. +sexy + +// menu : 2013-09-11 Wedding TLD2, LLC +menu + +// xn--rhqv96g : 2013-09-11 Stable Tone Limited +世界 + +// uno : 2013-09-11 Dot Latin, LLC +uno + +// gallery : 2013-09-13 Sugar House, LLC +gallery + +// technology : 2013-09-13 Auburn Falls +technology + +// xn--3bst00m : 2013-09-13 Eagle Horizon Limited +集团 + +// reviews : 2013-09-13 Extra Cover, LLC +reviews + +// guide : 2013-09-13 Snow Moon, LLC +guide + +// xn--6qq986b3x1 : 2013-09-13 Tycoon Treasure Limited +我爱你 + +// graphics : 2013-09-13 Over Madison, LLC +graphics + +// construction : 2013-09-13 Fox Dynamite, LLC +construction + +// onl : 2013-09-16 I-Registry Ltd. +onl + +// xn--q9jyb4c : 2013-09-17 Charleston Road Registry +みんな + +// diamonds : 2013-09-23 John Edge, LLC +diamonds + +// kiwi : 2013-09-23 Dot Kiwi Limited +kiwi + +// enterprises : 2013-09-23 Snow Oaks LLC +enterprises + +// today : 2013-09-23 Pearl Woods, LLC +today + +// futbol : 2013-09-23 Atomic Falls, LLC +futbol + +// photography : 2013-09-23 Sugar Glen, LLC +photography + +// tips : 2013-09-23 Corn Willow, LLC +tips + +// directory : 2013-09-23 Extra Madison, LLC +directory + +// kitchen : 2013-09-23 Just Goodbye, LLC +kitchen + +// xn--6frz82g : 2013-09-24 Afilias Limited +移动 + +// kim : 2013-09-24 Afilias Limited +kim + +// xn--cg4bki : 2013-09-27 Samsung SDS Co., LTD +삼성 + +// monash : 2013-10-01 Monash University +monash + +// wed : 2013-10-02 Atgron, Inc. +wed + +// pink : 2013-10-02 Afilias Limited +pink + +// ruhr : 2013-10-02 regiodot GmbH & Co. KG +ruhr + +// buzz : 2013-10-03 DOTSTRATEGY CO. +buzz + +// careers : 2013-10-03 Wild Corner, LLC +careers + +// shoes : 2013-10-03 Binky Galley, LLC +shoes + +// xn--4gbrim : 2013-10-07 Suhub Electronic Establishment +موقع + +// career : 2013-10-09 dotCareer, LLC +career + +// otsuka : 2013-10-11 Otsuka Holdings Co. Ltd. +otsuka + +// xn--fiQ64b : 2013-10-14 CITIC Group Corporation +中信 + +// gift : 2013-10-18 Uniregistry Corp. +gift + +// recipes : 2013-10-18 Grand Island, LLC +recipes + +// coffee : 2013-10-18 Trixy Cover, LLC +coffee + +// luxury : 2013-10-18 Luxury Partners, LLC +luxury + +// domains : 2013-10-18 Sugar Cross, LLC +domains + +// photos : 2013-10-18 Sea Corner, LLC +photos + +// limo : 2013-10-18 Hidden Frostbite, LLC +limo + +// viajes : 2013-10-18 Black Madison, LLC +viajes + +// wang : 2013-10-24 Zodiac Leo Limited +wang + +// democrat : 2013-10-24 United TLD Holdco Ltd. +democrat + +// mango : 2013-10-25 PUNTO FA S.L. +mango + +// cab : 2013-10-25 Half Sunset, LLC +cab + +// support : 2013-10-25 Grand Orchard, LLC +support + +// dance : 2013-10-25 United TLD Holdco Ltd. +dance + +// nagoya : 2013-10-25 GMO Registry, Inc. +nagoya + +// computer : 2013-10-25 Pine Mill, LLC +computer + +// wien : 2013-10-28 punkt.wien GmbH +wien + +// berlin : 2013-10-31 dotBERLIN GmbH & Co. KG +berlin + +// codes : 2013-10-31 Puff Willow, LLC +codes + +// email : 2013-10-31 Spring Madison, LLC +email + +// xn--mgbab2bd : 2013-10-31 CORE Association +بازار + +// repair : 2013-11-07 Lone Sunset, LLC +repair + +// holiday : 2013-11-07 Goose Woods, LLC +holiday + +// center : 2013-11-07 Tin Mill, LLC +center + +// systems : 2013-11-07 Dash Cypress, LLC +systems + +// wiki : 2013-11-07 Top Level Design, LLC +wiki + +// ceo : 2013-11-07 CEOTLD Pty Ltd +ceo + +// international : 2013-11-07 Wild Way, LLC +international + +// solar : 2013-11-07 Ruby Town, LLC +solar + +// company : 2013-11-07 Silver Avenue, LLC +company + +// education : 2013-11-07 Brice Way, LLC +education + +// training : 2013-11-07 Wild Willow, LLC +training + +// academy : 2013-11-07 Half Oaks, LLC +academy + +// marketing : 2013-11-07 Fern Pass, LLC +marketing + +// florist : 2013-11-08 Half Cypress, LLC +florist + +// solutions : 2013-11-07 Silver Cover, LLC +solutions + +// build : 2013-11-07 Plan Bee LLC +build + +// institute : 2013-11-07 Outer Maple, LLC +institute + +// builders : 2013-11-07 Atomic Madison, LLC +builders + +// red : 2013-11-07 Afilias Limited +red + +// blue : 2013-11-07 Afilias Limited +blue + +// ninja : 2013-11-07 United TLD Holdco Ltd. +ninja + +// business : 2013-11-07 Spring Cross, LLC +business + +// gal : 2013-11-07 Asociación puntoGAL +gal + +// social : 2013-11-07 United TLD Holdco Ltd. +social + +// house : 2013-11-07 Sugar Park, LLC +house + +// camp : 2013-11-07 Delta Dynamite, LLC +camp + +// immobilien : 2013-11-07 United TLD Holdco Ltd. +immobilien + +// moda : 2013-11-07 United TLD Holdco Ltd. +moda + +// glass : 2013-11-07 Black Cover, LLC +glass + +// management : 2013-11-07 John Goodbye, LLC +management + +// kaufen : 2013-11-07 United TLD Holdco Ltd. +kaufen + +// farm : 2013-11-07 Just Maple, LLC +farm + +// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center +公益 + +// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center +政务 + +// club : 2013-11-08 .CLUB DOMAINS, LLC +club + +// voting : 2013-11-13 Valuetainment Corp. +voting + +// TOKYO : 2013-11-13 GMO Registry, Inc. +tokyo + +// moe : 2013-11-13 Interlink Co., Ltd. +moe + +// guitars : 2013-11-14 Uniregistry, Corp. +guitars + +// bargains : 2013-11-14 Half Hallow, LLC +bargains + +// xn--nqv7fs00ema : 2013-11-14 Public Interest Registry +组织机构 + +// desi : 2013-11-14 Desi Networks LLC +desi + +// cool : 2013-11-14 Koko Lake, LLC +cool + +// boutique : 2013-11-14 Over Galley, LLC +boutique + +// pics : 2013-11-14 Uniregistry, Corp. +pics + +// xn--c1avg : 2013-11-14 Public Interest Registry +орг + +// xn--55qx5d : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） +公司 + +// xn--io0a7i : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） +网络 + +// cheap : 2013-11-14 Sand Cover, LLC +cheap + +// xn--xhq521b : 2013-11-14 Guangzhou YU Wei Information Technology Co., Ltd. +广东 + +// photo : 2013-11-14 Uniregistry, Corp. +photo + +// network : 2013-11-14 Trixy Manor, LLC +network + +// zone : 2013-11-14 Outer Falls, LLC +zone + +// xn--nqv7f : 2013-11-14 Public Interest Registry +机构 + +// link : 2013-11-14 Uniregistry, Corp. +link + +// QPON : 2013-11-14 dotCOOL, Inc. +qpon + +// xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry +संगठन + +// agency : 2013-11-14 Steel Falls, LLC +agency + +// tienda : 2013-11-14 Victor Manor, LLC +tienda + +// works : 2013-11-14 Little Dynamite, LLC +works + +// london : 2013-11-14 Dot London Domains Limited +london + +// watch : 2013-11-14 Sand Shadow, LLC +watch + +// rocks : 2013-11-14 Ruby Moon, LLC +rocks + +// SHIKSHA : 2013-11-14 Afilias Limited +shiksha + +// xn--d1acj3b : 2013-11-21 The Foundation for Network Initiatives “The Smart Internet” +дети + +// budapest : 2013-11-21 Top Level Domain Holdings Limited +budapest + +// nrw : 2013-11-21 Minds + Machines GmbH +nrw + +// VOTE : 2013-11-21 Monolith Registry LLC +vote + +// fishing : 2013-11-21 Top Level Domain Holdings Limited +fishing + +// expert : 2013-11-21 Magic Pass, LLC +expert + +// horse : 2013-11-21 Top Level Domain Holdings Limited +horse + +// christmas : 2013-11-21 Uniregistry, Corp. +christmas + +// cooking : 2013-11-21 Top Level Domain Holdings Limited +cooking + +// xn--czru2d : 2013-11-21 Zodiac Capricorn Limited +商城 + +// casa : 2013-11-21 Top Level Domain Holdings Limited +casa + +// rich : 2013-11-21 I-REGISTRY Ltd., Niederlassung Deutschland +rich + +// VOTO : 2013-11-21 Monolith Registry LLC +voto + +// tools : 2013-11-21 Pioneer North, LLC +tools + +// xn--45q11c : 2013-11-21 Zodiac Scorpio Limited +八卦 + +// praxi : 2013-12-05 Praxi S.p.A. +praxi + +// events : 2013-12-05 Pioneer Maple, LLC +events + +// flights : 2013-12-05 Fox Station, LLC +flights + +// report : 2013-12-05 Binky Glen, LLC +report + +// partners : 2013-12-05 Magic Glen, LLC +partners + +// neustar : 2013-12-05 NeuStar, Inc. +neustar + +// rentals : 2013-12-05 Big Hollow,LLC +rentals + +// catering : 2013-12-05 New Falls. LLC +catering + +// community : 2013-12-05 Fox Orchard, LLC +community + +// maison : 2013-12-05 Victor Frostbite, LLC +maison + +// parts : 2013-12-05 Sea Goodbye, LLC +parts + +// cleaning : 2013-12-05 Fox Shadow, LLC +cleaning + +// okinawa : 2013-12-05 BusinessRalliart inc. +okinawa + +// foundation : 2013-12-05 John Dale, LLC +foundation + +// properties : 2013-12-05 Big Pass, LLC +properties + +// vacations : 2013-12-05 Atomic Tigers, LLC +vacations + +// productions : 2013-12-05 Magic Birch, LLC +productions + +// industries : 2013-12-05 Outer House, LLC +industries + +// haus : 2013-12-05 Pixie Edge, LLC +haus + +// vision : 2013-12-05 Koko Station, LLC +vision + +// mormon : 2013-12-05 IRI Domain Management, LLC (""Applicant"") +mormon + +// cards : 2013-12-05 Foggy Hollow, LLC +cards + +// ink : 2013-12-05 Top Level Design, LLC +ink + +// villas : 2013-12-05 New Sky, LLC +villas + +// consulting : 2013-12-05 Pixie Station, LLC +consulting + +// cruises : 2013-12-05 Spring Way, LLC +cruises + +// krd : 2013-12-05 KRG Department of Information Technology +krd + +// xyz : 2013-12-05 XYZ.COM LLC +xyz + +// dating : 2013-12-05 Pine Fest, LLC +dating + +// exposed : 2013-12-05 Victor Beach, LLC +exposed + +// condos : 2013-12-05 Pine House, LLC +condos + +// eus : 2013-12-12 Puntueus Fundazioa +eus + +// Caravan : 2013-12-12 Caravan International, Inc. +caravan + +// actor : 2013-12-12 United TLD Holdco Ltd. +actor + +// saarland : 2013-12-12 dotSaarland GmbH +saarland + +// yokohama : 2013-12-12 GMO Registry, Inc. +yokohama + +// pub : 2013-12-12 United TLD Holdco Ltd. +pub + +// xn--p1acf : 2013-12-12 Rusnames Limited +рус + +// ren : 2013-12-12 Beijing Qianxiang Wangjing Technology Development Co., Ltd. +ren + +// fish : 2013-12-12 Fox Woods, LLC +fish + +// BAR : 2013-12-12 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable +bar + +// DNP : 2013-12-13 Dai Nippon Printing Co., Ltd. +dnp + +// bid : 2013-12-19 dot Bid Limited +bid + +// supply : 2013-12-19 Half Falls, LLC +supply + +// Miami : 2013-12-19 Top Level Domain Holdings Limited +miami + +// supplies : 2013-12-19 Atomic Fields, LLC +supplies + +// quebec : 2013-12-19 PointQuébec Inc +quebec + +// MOSCOW : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) +moscow + +// globo : 2013-12-19 Globo Comunicação e Participações S.A +globo + +// AXA : 2013-12-19 AXA SA +axa + +// xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) +москва + +// xn--czrs0t : 2013-12-19 Wild Island, LLC +商店 + +// vodka : 2013-12-19 Top Level Domain Holdings Limited +vodka + +// REST : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable +rest + +// frogans : 2013-12-19 OP3FT +frogans + +// WTC : 2013-12-19 World Trade Centers Association, Inc. +wtc + +// rodeo : 2013-12-19 Top Level Domain Holdings Limited +rodeo + +// sohu : 2013-12-19 Sohu.com Limited +sohu + +// BEST : 2013-12-19 BestTLD Pty Ltd +best + +// country : 2013-12-19 Top Level Domain Holdings Limited +country + +// KRED : 2013-12-19 KredTLD Pty Ltd +kred + +// feedback : 2013-12-19 Top Level Spectrum, Inc. +feedback + +// work : 2013-12-19 Top Level Domain Holdings Limited +work + +// luxe : 2014-01-09 Top Level Domain Holdings Limited +luxe + +// ryukyu : 2014-01-09 BusinessRalliart inc. +ryukyu + +// autos : 2014-01-09 DERAutos, LLC +autos + +// homes : 2014-01-09 DERHomes, LLC +homes + +// jetzt : 2014-01-09 New TLD Company AB +jetzt + +// yachts : 2014-01-09 DERYachts, LLC +yachts + +// motorcycles : 2014-01-09 DERMotorcycles, LLC +motorcycles + +// mini : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft +mini + +// ggee : 2014-01-09 GMO Internet, Inc. +ggee + +// beer : 2014-01-09 Top Level Domain Holdings Limited +beer + +// xn--1qqw23a : 2014-01-13 Guangzhou YU Wei Information Technology Co., Ltd. +佛山 + +// college : 2014-01-16 XYZ.COM LLC +college + +// ovh : 2014-01-16 OVH SAS +ovh + +// meet : 2014-01-16 Afilias Limited +meet + +// xn--ses554g : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED +网址 + +// gop : 2014-01-16 Republican State Leadership Committee, Inc. +gop + +// blackfriday : 2014-01-16 Uniregistry, Corp. +blackfriday + +// lacaixa : 2014-01-16 CAIXA D'ESTALVIS I PENSIONS DE BARCELONA +lacaixa + +// xn--czr694b : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES(HOLDING) COMPANY.HONGKONG LIMITED +商标 + +// vegas : 2014-01-16 Dot Vegas, Inc. +vegas + +// black : 2014-01-16 Afilias Limited +black + +// soy : 2014-01-23 Charleston Road Registry Inc. +soy + +// trade : 2014-01-23 Elite Registry Limited +trade + +// gent : 2014-01-23 COMBELL GROUP NV/SA +gent + +// ing : 2014-01-23 Charleston Road Registry Inc. +ing + +// dad : 2014-01-23 Charleston Road Registry Inc. +dad + +// shriram : 2014-01-23 Shriram Capital Ltd. +shriram + +// bayern : 2014-01-23 Bayern Connect GmbH +bayern + +// scot : 2014-01-23 Dot Scot Registry Limited +scot + +// webcam : 2014-01-23 dot Webcam Limited +webcam + +// foo : 2014-01-23 Charleston Road Registry Inc. +foo + +// eat : 2014-01-23 Charleston Road Registry Inc. +eat + +// nyc : 2014-01-23 The City of New York +nyc + +// prod : 2014-01-23 Charleston Road Registry Inc. +prod + +// how : 2014-01-23 Charleston Road Registry Inc. +how + +// day : 2014-01-30 Charleston Road Registry Inc. +day + +// meme : 2014-01-30 Charleston Road Registry Inc. +meme + +// mov : 2014-01-30 Charleston Road Registry Inc. +mov + +// paris : 2014-01-30 City of Paris +paris + +// boo : 2014-01-30 Charleston Road Registry Inc. +boo + +// new : 2014-01-30 Charleston Road Registry Inc. +new + +// ifm : 2014-01-30 ifm electronic gmbh +ifm + +// life : 2014-02-06 Trixy Oaks, LLC +life + +// archi : 2014-02-06 STARTING DOT LIMITED +archi + +// spiegel : 2014-02-06 SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG +spiegel + +// brussels : 2014-02-06 DNS.be vzw +brussels + +// church : 2014-02-06 Holly Fileds, LLC +church + +// here : 2014-02-06 Charleston Road Registry Inc. +here + +// dabur : 2014-02-06 Dabur India Limited +dabur + +// vlaanderen : 2014-02-06 DNS.be vzw +vlaanderen + +// cologne : 2014-02-06 NetCologne Gesellschaft für Telekommunikation mbH +cologne + +// xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd +手机 + +// wme : 2014-02-13 William Morris Endeavor Entertainment, LLC +wme + +// nhk : 2014-02-13 Japan Broadcasting Corporation (NHK) +nhk + +// suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION +suzuki + +// whoswho : 2014-02-20 Who's Who Registry +whoswho + +// scb : 2014-02-20 The Siam Commercial Bank Public Company Limited ("SCB""\) +scb + +// hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH +hamburg + +// services : 2014-02-27 Fox Castle, LLC +services + +// bzh : 2014-02-27 Association www.bzh +bzh + +// rio : 2014-02-27 Empresa Municipal de Informática SA - IPLANRIO +rio + +// cash : 2014-03-07 Delta Lake, LLC +cash + +// gives : 2014-03-07 United TLD Holdco Ltd. +gives + +// hiphop : 2014-03-07 Uniregistry, Corp. +hiphop + +// degree : 2014-03-07 Puff House, LLC +degree + +// digital : 2014-03-07 Dash Park, LLC +digital + +// rehab : 2014-03-07 United TLD Holdco Ltd. +rehab + +// wtf : 2014-03-07 Hidden Way, LLC +wtf + +// financial : 2014-03-07 Just Cover, LLC +financial + +// limited : 2014-03-07 Big Fest, LLC +limited + +// discount : 2014-03-07 Holly Hill, LLC +discount + +// fail : 2014-03-07 Atomic Pipe, LLC +fail + +// vet : 2014-03-07 Wild Dale, LLC +vet + +// ngo : 2014-03-07 Public Interest Registry +ngo + +// fitness : 2014-03-07 Brice Orchard, LLC +fitness + +// schule : 2014-03-07 Outer Moon, LLC +schule + +// navy : 2014-03-07 United TLD Holdco Ltd. +navy + +// bio : 2014-03-07 STARTING DOT LIMITED +bio + +// ong : 2014-03-07 Public Interest Registry +ong + +// town : 2014-03-07 Koko Moon, LLC +town + +// toys : 2014-03-07 Pioneer Orchard, LLC +toys + +// army : 2014-03-07 United TLD Holdco Ltd. +army + +// engineering : 2014-03-07 Romeo Canyon +engineering + +// capital : 2014-03-07 Delta Mill, LLC +capital + +// exchange : 2014-03-07 Spring Falls, LLC +exchange + +// fan : 2014-03-07 Goose Glen, LLC +fan + +// market : 2014-03-07 Victor Way, LLC +market + +// media : 2014-03-07 Grand Glen, LLC +media + +// lease : 2014-03-07 Victor Trail, LLC +lease + +// university : 2014-03-07 Little Station, LLC +university + +// reisen : 2014-03-07 New Cypress, LLC +reisen + +// airforce : 2014-03-07 United TLD Holdco Ltd. +airforce + +// pictures : 2014-03-07 Foggy Sky, LLC +pictures + +// gripe : 2014-03-07 Corn Sunset, LLC +gripe -// uy : http://www.nic.org.uy/ -uy -com.uy -edu.uy -gub.uy -mil.uy -net.uy -org.uy +// engineering : 2014-03-07 United TLD Holdco Ltd. +engineering -// uz : http://www.reg.uz/ -uz -co.uz -com.uz -net.uz -org.uz +// associates : 2014-03-07 Baxter Hill, LLC +associates -// va : http://en.wikipedia.org/wiki/.va -va +// xn--mxtq1m : 2014-03-07 Net-Chinese Co., Ltd. +政府 -// vc : http://en.wikipedia.org/wiki/.vc -// Submitted by registry <kshah(a)ca.afilias.info> 2008-06-13 -vc -com.vc -net.vc -org.vc -gov.vc -mil.vc -edu.vc +// williamhill : 2014-03-13 William Hill Organization Limited +williamhill -// ve : https://registro.nic.ve/ -// Confirmed by registry 2012-10-04 -ve -co.ve -com.ve -e12.ve -edu.ve -gov.ve -info.ve -mil.ve -net.ve -org.ve -web.ve +// hiv : 2014-03-13 dotHIV gemeinnuetziger e.V. +hiv -// vg : http://en.wikipedia.org/wiki/.vg -vg +// sca : 2014-03-13 SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ) +sca -// 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 -// are available for registration (which they do not seem to be). -vi -co.vi -com.vi -k12.vi -net.vi -org.vi +// reise : 2014-03-13 dotreise GmbH +reise -// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp -vn -com.vn -net.vn -org.vn -edu.vn -gov.vn -int.vn -ac.vn -biz.vn -info.vn -name.vn -pro.vn -health.vn +// accountants : 2014-03-20 Knob Town, LLC +accountants -// vu : http://en.wikipedia.org/wiki/.vu -// list of 2nd level tlds ? -vu +// clinic : 2014-03-20 Goose Park, LLC +clinic -// wf : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf -wf +// versicherung : 2014-03-20 dotversicherung-registry GmbH +versicherung -// ws : http://en.wikipedia.org/wiki/.ws -// http://samoanic.ws/index.dhtml -ws -com.ws -net.ws -org.ws -gov.ws -edu.ws +// top : 2014-03-20 Jiangsu Bangning Science & Technology Co.,Ltd. +top -// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf -yt +// furniture : 2014-03-20 Lone Fields, LLC +furniture -// IDN ccTLDs -// Please sort by ISO 3166 ccTLD, then punicode string -// when submitting patches and follow this format: -// <Punicode> ("<english word>" <language>) : <ISO 3166 ccTLD> -// [optional sponsoring org] -// <URL> +// dental : 2014-03-20 Tin Birch, LLC +dental -// xn--mgbaam7a8h ("Emerat" Arabic) : AE -// http://nic.ae/english/arabicdomain/rules.jsp -امارات +// fund : 2014-03-20 John Castle, LLC +fund -// xn--54b7fta0cc ("Bangla" Bangla) : BD -বাংলা +// creditcard : 2014-03-20 Binky Frostbite, LLC +creditcard -// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhonggou>) : CN -// CNNIC -// http://cnnic.cn/html/Dir/2005/10/11/3218.htm -中国 +// insure : 2014-03-20 Pioneer Willow, LLC +insure -// xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhonggou>) : CN -// CNNIC -// http://cnnic.cn/html/Dir/2005/10/11/3218.htm -中國 +// audio : 2014-03-20 Uniregistry, Corp. +audio -// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ -الجزائر +// claims : 2014-03-20 Black Corner, LLC +claims -// xn--wgbh1c ("Egypt" Arabic .masr) : EG -// http://www.dotmasr.eg/ -مصر +// loans : 2014-03-20 June Woods, LLC +loans -// xn--node ("ge" Georgian (Mkhedruli)) : GE -გე +// auction : 2014-03-20 Sand Galley, LLC +auction -// xn--j6w193g ("Hong Kong" Chinese-Han) : HK -// https://www2.hkirc.hk/register/rules.jsp -香港 +// attorney : 2014-03-20 Victor North, LLC +attorney -// xn--h2brj9c ("Bharat" Devanagari) : IN -// India -भारत +// finance : 2014-03-20 Cotton Cypress, LLC +finance -// xn--mgbbh1a71e ("Bharat" Arabic) : IN -// India -بھارت +// investments : 2014-03-20 Holly Glen, LLC +investments -// xn--fpcrj9c3d ("Bharat" Telugu) : IN -// India -భారత్ +// juegos : 2014-03-20 Uniregistry, Corp. +juegos -// xn--gecrj9c ("Bharat" Gujarati) : IN -// India -ભારત +// dentist : 2014-03-20 Outer Lake, LLC +dentist -// xn--s9brj9c ("Bharat" Gurmukhi) : IN -// India -ਭਾਰਤ +// lds : 2014-03-20 IRI Domain Management, LLC +lds -// xn--45brj9c ("Bharat" Bengali) : IN -// India -ভারত +// lawyer : 2014-03-20 Atomic Station, LLC +lawyer -// xn--xkc2dl3a5ee0h ("India" Tamil) : IN -// India -இந்தியா +// surgery : 2014-03-20 Tin Avenue, LLC +surgery -// xn--mgba3a4f16a ("Iran" Persian) : IR -ایران +// gratis : 2014-03-20 Pioneer Tigers, LLC +gratis -// xn--mgba3a4fra ("Iran" Arabic) : IR -ايران +// software : 2014-03-20 Over Birch, LLC +software -// xn--mgbayh7gpa ("al-Ordon" Arabic) : JO -// National Information Technology Center (NITC) -// Royal Scientific Society, Al-Jubeiha -الاردن +// mortgage : 2014-03-20 Outer Gardens, LLC +mortgage -// xn--3e0b707e ("Republic of Korea" Hangul) : KR -한국 +// republican : 2014-03-20 United TLD Holdco Ltd. +republican -// xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK -// http://nic.lk -ලංකා +// credit : 2014-03-20 Snow Shadow, LLC +credit -// xn--xkc2al3hye2a ("Ilangai" Tamil) : LK -// http://nic.lk -இலங்கை +// tax : 2014-03-20 Storm Orchard, LLC +tax -// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA -المغرب +// africa : 2014-03-24 ZA Central Registry NPC trading as Registry.Africa +africa -// xn--mgb9awbf ("Oman" Arabic) : OM -عمان +// joburg : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry +joburg -// xn--ygbi2ammx ("Falasteen" Arabic) : PS -// The Palestinian National Internet Naming Authority (PNINA) -// http://www.pnina.ps -فلسطين +// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry +durban -// xn--90a3ac ("srb" Cyrillic) : RS -срб +// capetown : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry +capetown -// xn--p1ai ("rf" Russian-Cyrillic) : RU -// http://www.cctld.ru/en/docs/rulesrf.php -рф +// sap : 2014-03-27 SAP AG +sap -// xn--wgbl6a ("Qatar" Arabic) : QA -// http://www.ict.gov.qa/ -قطر +// datsun : 2014-03-27 NISSAN MOTOR CO., LTD. +datsun -// xn--mgberp4a5d4ar ("AlSaudiah" Arabic) : SA -// http://www.nic.net.sa/ -السعودية +// infiniti : 2014-03-27 NISSAN MOTOR CO., LTD. +infiniti -// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA -السعودیة +// firmdale : 2014-03-27 Firmdale Holdings Limited +firmdale -// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA -السعودیۃ +// organic : 2014-03-27 Afilias Limited +organic -// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA -السعوديه +// nissan : 2014-03-27 NISSAN MOTOR CO., LTD. +nissan -// xn--ogbpf8fl ("Syria" Arabic) : SY -سورية +// website : 2014-04-03 DotWebsite Inc. +website -// xn--mgbtf8fl ("Syria" Arabic) variant : SY -سوريا +// space : 2014-04-03 DotSpace Inc. +space -// xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG -新加坡 +// schmidt : 2014-04-03 SALM S.A.S. +schmidt -// xn--clchc0ea0b2g2a9gcd ("Singapore" Tamil) : SG -சிங்கப்பூர் +// cuisinella : 2014-04-03 SALM S.A.S. +cuisinella -// xn--o3cw4h ("Thai" Thai) : TH -// http://www.thnic.co.th -ไทย +// samsung : 2014-04-03 SAMSUNG SDS CO., LTD +samsung -// xn--pgbs0dh ("Tunis") : TN -// http://nic.tn -تونس +// crs : 2014-04-03 Federated Co operatives Limited +crs -// xn--kpry57d ("Taiwan" Chinese-Han-Traditional) : TW -// http://www.twnic.net/english/dn/dn_07a.htm -台灣 +// doosan : 2014-04-03 Doosan Corporation +doosan -// xn--kprw13d ("Taiwan" Chinese-Han-Simplified) : TW -// http://www.twnic.net/english/dn/dn_07a.htm -台湾 +// press : 2014-04-03 DotPress Inc. +press -// xn--nnx388a ("Taiwan") variant : TW -臺灣 +// emerck : 2014-04-03 Merck KGaA +emerck -// xn--j1amh ("ukr" Cyrillic) : UA -укр +// erni : 2014-04-03 ERNI Group Holding AG +erni -// xn--mgb2ddes ("AlYemen" Arabic) : YE -اليمن +// direct : 2014-04-10 Half Trail, LLC +direct -// xxx : http://icmregistry.com -xxx +// yandex : 2014-04-10 YANDEX, LLC +yandex -// ye : http://www.y.net.ye/services/domain_name.htm -*.ye +// lotto : 2014-04-10 Afilias Limited +lotto -// za : http://www.zadna.org.za/slds.html -*.za +// toshiba : 2014-04-10 TOSHIBA Corporation +toshiba -// zm : http://en.wikipedia.org/wiki/.zm -*.zm +// bauhaus : 2014-04-17 Werkhaus GmbH +bauhaus -// zw : http://en.wikipedia.org/wiki/.zw -*.zw +// 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/ -// Requested by Donavan Miller <donavanm(a)amazon.com> 2013-03-22 +// Submitted by Donavan Miller <donavanm(a)amazon.com> 2013-03-22 cloudfront.net // Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/ -// Requested by Osman Surkatty <osmans(a)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(a)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/ -// Requested by Adam Stein <astein(a)amazon.com> 2013-04-02 +// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/ +// Submitted by Adam Stein <astein(a)amazon.com> 2013-04-02 elasticbeanstalk.com // Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/ -// Requested by Scott Vidmar <svidmar(a)amazon.com> 2013-03-27 +// Submitted by Scott Vidmar <svidmar(a)amazon.com> 2013-03-27 elb.amazonaws.com // Amazon S3 : https://aws.amazon.com/s3/ -// Requested by Courtney Eckhardt <coec(a)amazon.com> 2013-03-22 +// Submitted by Courtney Eckhardt <coec(a)amazon.com> 2013-03-22 s3.amazonaws.com s3-us-west-2.amazonaws.com s3-us-west-1.amazonaws.com @@ -6608,26 +8051,27 @@ s3-website-sa-east-1.amazonaws.com s3-website-us-gov-west-1.amazonaws.com // BetaInABox -// Requested by adrian(a)betainabox.com 2012-09-13 +// Submitted by adrian(a)betainabox.com 2012-09-13 betainabox.com // CentralNic : http://www.centralnic.com/names/domains -// Requested by registry <gavin.brown(a)centralnic.com> 2012-09-27 +// Submitted by registry <gavin.brown(a)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 -gr.com hu.com hu.net jp.net jpn.com kr.com +mex.com no.com qc.com ru.com @@ -6637,13 +8081,38 @@ se.net uk.com uk.net us.com -us.org uy.com +za.bz za.com +// Africa.com Web Solutions Ltd : https://registry.africa.com +// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 +africa.com + +// iDOT Services Limited : http://www.domain.gr.com +// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 +gr.com + +// Radix FZC : http://domains.in.net +// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 +in.net + +// US REGISTRY LLC : http://us.org +// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 +us.org + +// co.com Registry, LLC : https://registry.co.com +// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 +co.com + // c.la : http://www.c.la/ c.la +// cloudControl : https://www.cloudcontrol.com/ +// Submitted by Tobias Wilken <tw(a)cloudcontrol.com> 2013-07-23 +cloudcontrolled.com +cloudcontrolapp.com + // co.ca : http://registry.co.ca/ co.ca @@ -6651,8 +8120,12 @@ co.ca co.nl co.no +// Cupcake : https://cupcake.io/ +// Submitted by Jonathan Rudenberg <jonathan(a)cupcake.io> 2013-10-08 +cupcake.is + // DreamHost : http://www.dreamhost.com/ -// Requested by Andrew Farmer <andrew.farmer(a)dreamhost.com> 2012-10-02 +// Submitted by Andrew Farmer <andrew.farmer(a)dreamhost.com> 2012-10-02 dreamhosters.com // DynDNS.com : http://www.dyndns.com/services/dns/dyndns/ @@ -6936,12 +8409,29 @@ webhop.org worse-than.tv writesthisblog.com +// Fastly Inc. http://www.fastly.com/ +// Submitted by Vladimir Vuksan <vladimir(a)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(a)firebase.com> 2014-01-21 +firebaseapp.com + // GitHub, Inc. -// Requested by Ben Toews <btoews(a)github.com> 2013-04-18 +// Submitted by Ben Toews <btoews(a)github.com> 2014-02-06 github.io +githubusercontent.com + +// GlobeHosting, Inc. +// Submitted by Zoltan Egresi <egresi(a)globehosting.com> 2013-07-12 +ro.com // Google, Inc. -// Requested by Eduardo Vela <evn(a)google.com> 2012-10-24 +// Submitted by Eduardo Vela <evn(a)google.com> 2012-10-24 appspot.com blogspot.be blogspot.bj @@ -6986,14 +8476,15 @@ blogspot.tw codespot.com googleapis.com googlecode.com +withgoogle.com // Heroku : https://www.heroku.com/ -// Requested by Tom Maher <tmaher(a)heroku.com> 2013-05-02 +// Submitted by Tom Maher <tmaher(a)heroku.com> 2013-05-02 herokuapp.com herokussl.com // iki.fi -// Requested by Hannu Aronsson <haa(a)iki.fi> 2009-11-05 +// Submitted by Hannu Aronsson <haa(a)iki.fi> 2009-11-05 iki.fi // info.at : http://www.info.at/ @@ -7003,24 +8494,42 @@ info.at // Michau Enterprises Limited : http://www.co.pl/ co.pl +// Microsoft : http://microsoft.com +// Submitted by Barry Dorrans <bdorrans(a)microsoft.com> 2014-01-24 +azurewebsites.net +azure-mobile.net +cloudapp.net + +// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/ +// Submitted by Jeff Wheelhouse <support(a)nearlyfreespeech.net> 2014-02-02 +nfshost.com + // NYC.mn : http://www.information.nyc.mn -// Requested by Matthew Brown <mattbrown(a)nyc.mn> 2013-03-11 +// Submitted by Matthew Brown <mattbrown(a)nyc.mn> 2013-03-11 nyc.mn +// One Fold Media : http://www.onefoldmedia.com/ +// Submitted by Eddie Jones <eddie(a)onefoldmedia.com> 2014-06-10 +nid.io + // Opera Software, A.S.A. -// Requested by Yngve Pettersen <yngve(a)opera.com> 2009-11-26 +// Submitted by Yngve Pettersen <yngve(a)opera.com> 2009-11-26 operaunite.com +// OutSystems +// Submitted by Duarte Santos <domain-admin(a)outsystemscloud.com> 2014-03-11 +outsystemscloud.com + // Red Hat, Inc. OpenShift : https://openshift.redhat.com/ -// Requested by Tim Kramer <tkramer(a)rhcloud.com> 2012-10-24 +// Submitted by Tim Kramer <tkramer(a)rhcloud.com> 2012-10-24 rhcloud.com // priv.at : http://www.nic.priv.at/ -// Requested by registry <lendl(a)nic.at> 2008-06-09 +// Submitted by registry <lendl(a)nic.at> 2008-06-09 priv.at // ZaNiC : http://www.za.net/ -// Requested by registry <hostmaster(a)nic.za.net> 2009-10-03 +// Submitted by registry <hostmaster(a)nic.za.net> 2009-10-03 za.net za.org diff --git a/netwerk/test/unit/data/test_psl.txt b/netwerk/test/unit/data/test_psl.txt index 5a75831..35c8ccf 100644 --- a/netwerk/test/unit/data/test_psl.txt +++ b/netwerk/test/unit/data/test_psl.txt @@ -60,12 +60,12 @@ checkPublicSuffix('a.b.c.kobe.jp', 'b.c.kobe.jp'); checkPublicSuffix('city.kobe.jp', 'city.kobe.jp'); checkPublicSuffix('www.city.kobe.jp', 'city.kobe.jp'); // TLD with a wildcard rule and exceptions. -checkPublicSuffix('om', null); -checkPublicSuffix('test.om', null); -checkPublicSuffix('b.test.om', 'b.test.om'); -checkPublicSuffix('a.b.test.om', 'b.test.om'); -checkPublicSuffix('songfest.om', 'songfest.om'); -checkPublicSuffix('www.songfest.om', 'songfest.om'); +checkPublicSuffix('ck', null); +checkPublicSuffix('test.ck', null); +checkPublicSuffix('b.test.ck', 'b.test.ck'); +checkPublicSuffix('a.b.test.ck', 'b.test.ck'); +checkPublicSuffix('www.ck', 'www.ck'); +checkPublicSuffix('www.www.ck', 'www.ck'); // US K12. checkPublicSuffix('us', null); checkPublicSuffix('test.us', 'test.us'); @@ -76,3 +76,23 @@ checkPublicSuffix('www.test.ak.us', 'test.ak.us'); checkPublicSuffix('k12.ak.us', null); checkPublicSuffix('test.k12.ak.us', 'test.k12.ak.us'); checkPublicSuffix('www.test.k12.ak.us', 'test.k12.ak.us'); +// IDN labels. +checkPublicSuffix('食狮.com.cn', '食狮.com.cn'); +checkPublicSuffix('食狮.公司.cn', '食狮.公司.cn'); +checkPublicSuffix('www.食狮.公司.cn', '食狮.公司.cn'); +checkPublicSuffix('shishi.公司.cn', 'shishi.公司.cn'); +checkPublicSuffix('公司.cn', null); +checkPublicSuffix('食狮.中国', '食狮.中国'); +checkPublicSuffix('www.食狮.中国', '食狮.中国'); +checkPublicSuffix('shishi.中国', 'shishi.中国'); +checkPublicSuffix('中国', null); +// Same as above, but punycoded. +checkPublicSuffix('xn--85x722f.com.cn', 'xn--85x722f.com.cn'); +checkPublicSuffix('xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn'); +checkPublicSuffix('www.xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn'); +checkPublicSuffix('shishi.xn--55qx5d.cn', 'shishi.xn--55qx5d.cn'); +checkPublicSuffix('xn--55qx5d.cn', null); +checkPublicSuffix('xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s'); +checkPublicSuffix('www.xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s'); +checkPublicSuffix('shishi.xn--fiqs8s', 'shishi.xn--fiqs8s'); +checkPublicSuffix('xn--fiqs8s', null); diff --git a/netwerk/test/unit/test_psl.js b/netwerk/test/unit/test_psl.js index 446fe4c..ff4a5e7 100644 --- a/netwerk/test/unit/test_psl.js +++ b/netwerk/test/unit/test_psl.js @@ -4,6 +4,9 @@ const Ci = Components.interfaces; var etld = Cc["@mozilla.org/network/effective-tld-service;1"] .getService(Ci.nsIEffectiveTLDService); +var idna = Cc["@mozilla.org/network/idn-service;1"] + .getService(Ci.nsIIDNService); + function run_test() { var file = do_get_file("data/test_psl.txt"); @@ -13,7 +16,7 @@ function run_test() var scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"] .getService(Ci.mozIJSSubScriptLoader); var srvScope = {}; - scriptLoader.loadSubScript(uri.spec, srvScope); + scriptLoader.loadSubScript(uri.spec, srvScope, "utf-8"); } function checkPublicSuffix(host, expectedSuffix) @@ -24,5 +27,11 @@ function checkPublicSuffix(host, expectedSuffix) } catch (e if e.name == "NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS" || e.name == "NS_ERROR_ILLEGAL_VALUE") { } + // The EffectiveTLDService always gives back punycoded labels. + // The test suite wants to get back what it put in. + if (actualSuffix !== null && expectedSuffix !== null && + /(^|\.)xn--/.test(actualSuffix) && !/(^|\.)xn--/.test(expectedSuffix)) { + actualSuffix = idna.convertACEtoUTF8(actualSuffix); + } do_check_eq(actualSuffix, expectedSuffix); }

1 0

[tor-browser/esr24] Backed out 3 changesets (bug 1033340) for xpcshell failures.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 613b3c28ec08cc67965695a6cad0b24f12b0ecf5 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Thu Jul 3 14:03:52 2014 -0400 Backed out 3 changesets (bug 1033340) for xpcshell failures. Backed out changeset cad29a5b752d (bug 1033340) Backed out changeset 284590145d2d (bug 1033340) Backed out changeset 34182c54281a (bug 1033340) --- netwerk/dns/effective_tld_names.dat | 2525 +++++++---------------------------- netwerk/test/unit/data/test_psl.txt | 32 +- netwerk/test/unit/test_psl.js | 14 +- 3 files changed, 518 insertions(+), 2053 deletions(-) diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index c83fe0b..ed1123b 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -175,21 +175,20 @@ 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 +// ar : http://en.wikipedia.org/wiki/.ar +*.ar +!congresodelalengua3.ar +!educ.ar +!gobiernoelectronico.ar +!mecon.ar +!nacion.ar +!nic.ar +!promocion.ar +!retina.ar +!uba.ar // arpa : http://en.wikipedia.org/wiki/.arpa // Confirmed by registry <iana-questions(a)icann.org> 2008-06-18 -arpa e164.arpa in-addr.arpa ip6.arpa @@ -214,7 +213,6 @@ or.at // au : http://en.wikipedia.org/wiki/.au // http://www.auda.org.au/ -au // 2LDs com.au net.au @@ -245,9 +243,10 @@ sa.edu.au tas.edu.au vic.edu.au wa.edu.au -// act.gov.au Bug 984824 - Removed at request of Greg Tankard -// nsw.gov.au Bug 547985 - Removed at request of <Shae.Donelan(a)services.nsw.gov.au> -// nt.gov.au Bug 940478 - Removed at request of Greg Connors <Greg.Connors(a)nt.gov.au> +act.gov.au +// Removed at request of Shae.Donelan(a)services.nsw.gov.au, 2010-03-04 +// nsw.gov.au +nt.gov.au qld.gov.au sa.gov.au tas.gov.au @@ -292,7 +291,6 @@ rs.ba // bb : http://en.wikipedia.org/wiki/.bb bb biz.bb -co.bb com.bb edu.bb gov.bb @@ -300,7 +298,6 @@ info.bb net.bb org.bb store.bb -tv.bb // bd : http://en.wikipedia.org/wiki/.bd *.bd @@ -352,7 +349,7 @@ z.bg 6.bg 7.bg 8.bg -9.bg +9.bg // bh : http://en.wikipedia.org/wiki/.bh bh @@ -403,8 +400,8 @@ net.bo mil.bo tv.bo -// br : http://registro.br/dominio/categoria.html -// Submitted by registry <fneves(a)registro.br> 2014-03-04 +// br : http://registro.br/dominio/dpn.html +// Updated by registry <fneves(a)registro.br> 2011-03-01 br adm.br adv.br @@ -449,7 +446,6 @@ lel.br mat.br med.br mil.br -mp.br mus.br net.br nom.br @@ -495,7 +491,6 @@ org.bt // bv : No registrations at this time. // Submitted by registry <jarle(a)uninett.no> 2006-06-16 -bv // bw : http://en.wikipedia.org/wiki/.bw // http://www.gobin.info/domainname/bw.doc @@ -598,12 +593,9 @@ gob.cl co.cl mil.cl -// cm : http://en.wikipedia.org/wiki/.cm plus bug 981927 +// cm : http://en.wikipedia.org/wiki/.cm cm -co.cm -com.cm gov.cm -net.cm // cn : http://en.wikipedia.org/wiki/.cn // Submitted by registry <tanyaling(a)cnnic.cn> 2008-06-11 @@ -795,7 +787,7 @@ org.ee fie.ee // eg : http://en.wikipedia.org/wiki/.eg -eg +eg com.eg edu.eg eun.eg @@ -818,14 +810,7 @@ gob.es edu.es // et : http://en.wikipedia.org/wiki/.et -et -com.et -gov.et -org.et -edu.et -biz.et -name.et -info.et +*.et // eu : http://en.wikipedia.org/wiki/.eu eu @@ -884,7 +869,6 @@ ga // gb : This registry is effectively dormant // Submitted by registry <Damien.Shaw(a)ja.net> 2008-06-12 -gb // gd : http://en.wikipedia.org/wiki/.gd gd @@ -902,12 +886,13 @@ pvt.ge // gf : http://en.wikipedia.org/wiki/.gf gf -// gg : http://www.channelisles.net/register-domains/ -// Confirmed by registry <nigel(a)channelisles.net> 2013-11-28 +// gg : http://www.channelisles.net/applic/avextn.shtml gg co.gg -net.gg org.gg +net.gg +sch.gg +gov.gg // gh : http://en.wikipedia.org/wiki/.gh // see also: http://www.nic.gh/reg_now.php @@ -938,7 +923,6 @@ gm // gn : http://psg.com/dns/gn/gn.txt // Submitted by registry <randy(a)psg.com> 2008-06-17 -gn ac.gn com.gn edu.gn @@ -1019,7 +1003,7 @@ org.hk 网絡.hk 组织.hk 組織.hk -組织.hk +組织.hk // hm : http://en.wikipedia.org/wiki/.hm hm @@ -1100,7 +1084,6 @@ id ac.id biz.id co.id -desa.id go.id mil.id my.id @@ -1116,18 +1099,16 @@ gov.ie // il : http://en.wikipedia.org/wiki/.il *.il -// im : https://www.nic.im/ -// Submitted by registry <info(a)nic.im> 2013-11-15 +// im : https://www.nic.im/pdfs/imfaqs.pdf im -ac.im co.im -com.im ltd.co.im +plc.co.im net.im +gov.im org.im -plc.co.im -tt.im -tv.im +nic.im +ac.im // in : http://en.wikipedia.org/wiki/.in // see also: http://www.inregistry.in/policies/ @@ -1199,385 +1180,294 @@ int.is it gov.it edu.it -// Reserved geo-names: +// list of reserved geo-names : // http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazi… -// There is also a list of reserved geo-names corresponding to Italian municipalities -// http://www.nic.it/documenti/appendice-c.pdf, but it is not included here. -// Regions -abr.it -abruzzo.it -aosta-valley.it -aostavalley.it -bas.it -basilicata.it -cal.it -calabria.it -cam.it -campania.it -emilia-romagna.it -emiliaromagna.it -emr.it -friuli-v-giulia.it -friuli-ve-giulia.it -friuli-vegiulia.it -friuli-venezia-giulia.it -friuli-veneziagiulia.it -friuli-vgiulia.it -friuliv-giulia.it -friulive-giulia.it -friulivegiulia.it -friulivenezia-giulia.it -friuliveneziagiulia.it -friulivgiulia.it -fvg.it -laz.it -lazio.it -lig.it -liguria.it -lom.it -lombardia.it -lombardy.it -lucania.it -mar.it -marche.it -mol.it -molise.it -piedmont.it -piemonte.it -pmn.it -pug.it -puglia.it -sar.it -sardegna.it -sardinia.it -sic.it -sicilia.it -sicily.it -taa.it -tos.it -toscana.it -trentino-a-adige.it -trentino-aadige.it -trentino-alto-adige.it -trentino-altoadige.it -trentino-s-tirol.it -trentino-stirol.it -trentino-sud-tirol.it -trentino-sudtirol.it -trentino-sued-tirol.it -trentino-suedtirol.it -trentinoa-adige.it -trentinoaadige.it -trentinoalto-adige.it -trentinoaltoadige.it -trentinos-tirol.it -trentinostirol.it -trentinosud-tirol.it -trentinosudtirol.it -trentinosued-tirol.it -trentinosuedtirol.it -tuscany.it -umb.it -umbria.it -val-d-aosta.it -val-daosta.it -vald-aosta.it -valdaosta.it -valle-aosta.it -valle-d-aosta.it -valle-daosta.it -valleaosta.it -valled-aosta.it -valledaosta.it -vallee-aoste.it -valleeaoste.it -vao.it -vda.it -ven.it -veneto.it -// Provinces -ag.it +// (There is also a list of reserved geo-names corresponding to Italian +// municipalities : http://www.nic.it/documenti/appendice-c.pdf , but it is +// not included here.) agrigento.it -al.it +ag.it alessandria.it -alto-adige.it -altoadige.it -an.it +al.it ancona.it -andria-barletta-trani.it -andria-trani-barletta.it -andriabarlettatrani.it -andriatranibarletta.it -ao.it +an.it aosta.it aoste.it -ap.it -aq.it -aquila.it -ar.it +ao.it arezzo.it +ar.it ascoli-piceno.it ascolipiceno.it +ap.it asti.it at.it -av.it avellino.it -ba.it -balsan.it +av.it bari.it +ba.it +andria-barletta-trani.it +andriabarlettatrani.it +trani-barletta-andria.it +tranibarlettaandria.it barletta-trani-andria.it barlettatraniandria.it +andria-trani-barletta.it +andriatranibarletta.it +trani-andria-barletta.it +traniandriabarletta.it +bt.it belluno.it +bl.it benevento.it +bn.it bergamo.it bg.it -bi.it biella.it -bl.it -bn.it -bo.it +bi.it bologna.it +bo.it bolzano.it bozen.it -br.it +balsan.it +alto-adige.it +altoadige.it +suedtirol.it +bz.it brescia.it -brindisi.it bs.it -bt.it -bz.it -ca.it +brindisi.it +br.it cagliari.it +ca.it caltanissetta.it -campidano-medio.it -campidanomedio.it +cl.it campobasso.it -carbonia-iglesias.it +cb.it carboniaiglesias.it -carrara-massa.it -carraramassa.it +carbonia-iglesias.it +iglesias-carbonia.it +iglesiascarbonia.it +ci.it caserta.it +ce.it catania.it +ct.it catanzaro.it -cb.it -ce.it -cesena-forli.it -cesenaforli.it -ch.it +cz.it chieti.it -ci.it -cl.it -cn.it -co.it +ch.it como.it +co.it cosenza.it -cr.it +cs.it cremona.it +cr.it crotone.it -cs.it -ct.it +kr.it cuneo.it -cz.it +cn.it dell-ogliastra.it dellogliastra.it -en.it +ogliastra.it +og.it enna.it -fc.it +en.it +ferrara.it fe.it fermo.it -ferrara.it -fg.it -fi.it +fm.it firenze.it florence.it -fm.it +fi.it foggia.it +fg.it forli-cesena.it forlicesena.it -fr.it +cesena-forli.it +cesenaforli.it +fc.it frosinone.it -ge.it -genoa.it +fr.it genova.it -go.it +genoa.it +ge.it gorizia.it -gr.it +go.it grosseto.it -iglesias-carbonia.it -iglesiascarbonia.it -im.it +gr.it imperia.it -is.it +im.it isernia.it -kr.it -la-spezia.it +is.it laquila.it +aquila.it +aq.it +la-spezia.it laspezia.it +sp.it latina.it -lc.it -le.it +lt.it lecce.it +le.it lecco.it -li.it +lc.it livorno.it -lo.it +li.it lodi.it -lt.it -lu.it +lo.it lucca.it +lu.it macerata.it +mc.it mantova.it +mn.it massa-carrara.it massacarrara.it +carrara-massa.it +carraramassa.it +ms.it matera.it -mb.it -mc.it -me.it +mt.it medio-campidano.it mediocampidano.it +campidano-medio.it +campidanomedio.it +vs.it messina.it -mi.it -milan.it +me.it milano.it -mn.it -mo.it +milan.it +mi.it modena.it -monza-brianza.it -monza-e-della-brianza.it +mo.it monza.it +monza-brianza.it monzabrianza.it monzaebrianza.it monzaedellabrianza.it -ms.it -mt.it -na.it -naples.it +monza-e-della-brianza.it +mb.it napoli.it -no.it +naples.it +na.it novara.it -nu.it +no.it nuoro.it -og.it -ogliastra.it -olbia-tempio.it -olbiatempio.it -or.it +nu.it oristano.it -ot.it -pa.it +or.it padova.it padua.it +pd.it palermo.it +pa.it parma.it +pr.it pavia.it -pc.it -pd.it -pe.it +pv.it perugia.it +pg.it +pescara.it +pe.it pesaro-urbino.it pesarourbino.it -pescara.it -pg.it -pi.it +urbino-pesaro.it +urbinopesaro.it +pu.it piacenza.it +pc.it pisa.it +pi.it pistoia.it -pn.it -po.it +pt.it pordenone.it +pn.it potenza.it -pr.it -prato.it -pt.it -pu.it -pv.it pz.it -ra.it +prato.it +po.it ragusa.it +rg.it ravenna.it -rc.it -re.it +ra.it reggio-calabria.it -reggio-emilia.it reggiocalabria.it +rc.it +reggio-emilia.it reggioemilia.it -rg.it -ri.it +re.it rieti.it +ri.it rimini.it -rm.it rn.it -ro.it roma.it rome.it +rm.it rovigo.it -sa.it +ro.it salerno.it +sa.it sassari.it +ss.it savona.it -si.it +sv.it siena.it +si.it siracusa.it -so.it -sondrio.it -sp.it sr.it -ss.it -suedtirol.it -sv.it -ta.it +sondrio.it +so.it taranto.it -te.it +ta.it tempio-olbia.it tempioolbia.it +olbia-tempio.it +olbiatempio.it +ot.it teramo.it +te.it terni.it -tn.it -to.it +tr.it torino.it -tp.it -tr.it -trani-andria-barletta.it -trani-barletta-andria.it -traniandriabarletta.it -tranibarlettaandria.it +turin.it +to.it trapani.it -trentino.it +tp.it trento.it +trentino.it +tn.it treviso.it +tv.it trieste.it ts.it -turin.it -tv.it -ud.it udine.it -urbino-pesaro.it -urbinopesaro.it -va.it +ud.it varese.it -vb.it -vc.it -ve.it +va.it venezia.it venice.it +ve.it verbania.it +vb.it vercelli.it +vc.it verona.it -vi.it +vr.it vibo-valentia.it vibovalentia.it +vv.it vicenza.it +vi.it viterbo.it -vr.it -vs.it vt.it -vv.it -// je : http://www.channelisles.net/register-domains/ -// Confirmed by registry <nigel(a)channelisles.net> 2013-11-28 +// je : http://www.channelisles.net/applic/avextn.shtml je co.je -net.je org.je +net.je +sch.je +gov.je // jm : http://www.com.jm/register.html *.jm @@ -1598,7 +1488,7 @@ jobs // jp : http://en.wikipedia.org/wiki/.jp // http://jprs.co.jp/en/jpdomain.html -// Submitted by registry <info(a)jprs.jp> 2014-02-28 +// Updated by registry <info(a)jprs.jp> 2012-05-28 jp // jp organizational type names ac.jp @@ -1702,6 +1592,7 @@ konan.aichi.jp kota.aichi.jp mihama.aichi.jp miyoshi.aichi.jp +nagakute.aichi.jp nishio.aichi.jp nisshin.aichi.jp obu.aichi.jp @@ -2373,6 +2264,7 @@ rikuzentakata.iwate.jp shiwa.iwate.jp shizukuishi.iwate.jp sumita.iwate.jp +takizawa.iwate.jp tanohata.iwate.jp tono.iwate.jp yahaba.iwate.jp @@ -3410,7 +3302,6 @@ edu.kn gov.kn // kp : http://www.kcce.kp/en_index.php -kp com.kp edu.kp gov.kp @@ -3488,7 +3379,6 @@ org.la // lb : http://en.wikipedia.org/wiki/.lb // Submitted by registry <randy(a)psg.com> 2008-06-17 -lb com.lb edu.lb gov.lb @@ -3527,7 +3417,6 @@ hotel.lk // lr : http://psg.com/dns/lr/lr.txt // Submitted by registry <randy(a)psg.com> 2008-06-17 -lr com.lr edu.lr gov.lr @@ -3670,21 +3559,11 @@ mq mr gov.mr -// ms : http://www.nic.ms/pdf/MS_Domain_Name_Rules.pdf +// ms : http://en.wikipedia.org/wiki/.ms ms -com.ms -edu.ms -gov.ms -net.ms -org.ms - -// mt : https://www.nic.org.mt/go/policy -// Submitted by registry <help(a)nic.org.mt> 2013-11-19 -mt -com.mt -edu.mt -net.mt -org.mt + +// mt : https://www.nic.org.mt/dotmt/ +*.mt // mu : http://en.wikipedia.org/wiki/.mu mu @@ -4351,16 +4230,13 @@ other.nf store.nf // ng : http://psg.com/dns/ng/ -ng +// Submitted by registry <randy(a)psg.com> 2008-06-17 +ac.ng com.ng edu.ng -name.ng +gov.ng net.ng org.ng -sch.ng -gov.ng -mil.ng -mobi.ng // ni : http://www.nic.ni/dominios.htm *.ni @@ -4376,7 +4252,7 @@ bv.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: +// announce mailing list: // https://postlister.uninett.no/sympa/info/norid-diskusjon no // Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html @@ -5158,36 +5034,20 @@ com.nr nu // nz : http://en.wikipedia.org/wiki/.nz -// Confirmed by registry <jay(a)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 +*.nz // om : http://en.wikipedia.org/wiki/.om -om -co.om -com.om -edu.om -gov.om -med.om -museum.om -net.om -org.om -pro.om +*.om +!mediaphone.om +!nawrastelecom.om +!nawras.om +!omanmobile.om +!omanpost.om +!omantel.om +!rakpetroleum.om +!siemens.om +!songfest.om +!statecouncil.om // org : http://en.wikipedia.org/wiki/.org org @@ -5642,6 +5502,7 @@ oryol.ru palana.ru penza.ru perm.ru +pskov.ru ptz.ru rnd.ru ryazan.ru @@ -5761,7 +5622,7 @@ gov.sd info.sd // se : http://en.wikipedia.org/wiki/.se -// Submitted by registry <patrik.wallstrom(a)iis.se> 2014-03-18 +// Submitted by registry <Patrik.Wallstrom(a)iis.se> 2008-06-24 se a.se ac.se @@ -5795,6 +5656,7 @@ pp.se press.se r.se s.se +sshn.se t.se tm.se u.se @@ -5825,7 +5687,6 @@ si // sj : No registrations at this time. // Submitted by registry <jarle(a)uninett.no> 2008-06-16 -sj // sk : http://en.wikipedia.org/wiki/.sk // list of 2nd level domains ? @@ -5880,13 +5741,8 @@ store.st // su : http://en.wikipedia.org/wiki/.su su -// sv : http://www.svnet.org.sv/niveldos.pdf -sv -com.sv -edu.sv -gob.sv -org.sv -red.sv +// sv : http://www.svnet.org.sv/svpolicy.html +*.sv // sx : http://en.wikipedia.org/wiki/.sx // Confirmed by registry <jcvignes(a)openregistry.com> 2012-05-31 @@ -6008,10 +5864,6 @@ org.to edu.to mil.to -// tp : No registrations at this time. -// Submitted by Ryan Sleevi <ryan.sleevi(a)gmail.com> 2014-01-03 -tp - // tr : http://en.wikipedia.org/wiki/.tr *.tr !nic.tr @@ -6065,7 +5917,6 @@ club.tw // tz : http://www.tznic.or.tz/index.php/domains // Confirmed by registry <manager(a)tznic.or.tz> 2013-01-22 -tz ac.tz co.tz go.tz @@ -6178,19 +6029,19 @@ com.ug org.ug // uk : http://en.wikipedia.org/wiki/.uk -// Submitted by registry <Michael.Daly(a)nominet.org.uk> -uk -ac.uk -co.uk -gov.uk -ltd.uk -me.uk -net.uk -nhs.uk -org.uk -plc.uk -police.uk +// Submitted by registry <noc(a)nominet.org.uk> 2012-10-02 +// and tweaked by us pending further consultation. +*.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 @@ -6274,7 +6125,7 @@ k12.de.us k12.fl.us k12.ga.us k12.gu.us -// k12.hi.us Bug 614565 - Hawaii has a state-wide DOE login +// k12.hi.us Hawaii has a state-wide DOE login: bug 614565 k12.ia.us k12.id.us k12.il.us @@ -6305,7 +6156,7 @@ k12.pa.us k12.pr.us k12.ri.us k12.sc.us -// k12.sd.us Bug 934131 - Removed at request of James Booze <James.Booze(a)k12.sd.us> +k12.sd.us k12.tn.us k12.tx.us k12.ut.us @@ -6314,7 +6165,7 @@ k12.vt.us k12.va.us k12.wa.us k12.wi.us -// k12.wv.us Bug 947705 - Removed at request of Verne Britton <verne(a)wvnet.edu> +k12.wv.us k12.wy.us cc.ak.us @@ -6382,1654 +6233,360 @@ lib.ca.us lib.co.us lib.ct.us lib.dc.us -lib.de.us -lib.fl.us -lib.ga.us -lib.gu.us -lib.hi.us -lib.ia.us -lib.id.us -lib.il.us -lib.in.us -lib.ks.us -lib.ky.us -lib.la.us -lib.ma.us -lib.md.us -lib.me.us -lib.mi.us -lib.mn.us -lib.mo.us -lib.ms.us -lib.mt.us -lib.nc.us -lib.nd.us -lib.ne.us -lib.nh.us -lib.nj.us -lib.nm.us -lib.nv.us -lib.ny.us -lib.oh.us -lib.ok.us -lib.or.us -lib.pa.us -lib.pr.us -lib.ri.us -lib.sc.us -lib.sd.us -lib.tn.us -lib.tx.us -lib.ut.us -lib.vi.us -lib.vt.us -lib.va.us -lib.wa.us -lib.wi.us -// lib.wv.us Bug 941670 - Removed at request of Larry W Arnold <arnold(a)wvlc.lib.wv.us> -lib.wy.us - -// k12.ma.us contains school districts in Massachusetts. The 4LDs are -// managed indepedently except for private (PVT), charter (CHTR) and -// parochial (PAROCH) schools. Those are delegated dorectly to the -// 5LD operators. <k12-ma-hostmaster _ at _ rsuc.gweep.net> -pvt.k12.ma.us -chtr.k12.ma.us -paroch.k12.ma.us - -// uy : http://www.nic.org.uy/ -uy -com.uy -edu.uy -gub.uy -mil.uy -net.uy -org.uy - -// uz : http://www.reg.uz/ -uz -co.uz -com.uz -net.uz -org.uz - -// va : http://en.wikipedia.org/wiki/.va -va - -// vc : http://en.wikipedia.org/wiki/.vc -// Submitted by registry <kshah(a)ca.afilias.info> 2008-06-13 -vc -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 -// are available for registration (which they do not seem to be). -vi -co.vi -com.vi -k12.vi -net.vi -org.vi - -// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp -vn -com.vn -net.vn -org.vn -edu.vn -gov.vn -int.vn -ac.vn -biz.vn -info.vn -name.vn -pro.vn -health.vn - -// vu : http://en.wikipedia.org/wiki/.vu -// 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 -net.ws -org.ws -gov.ws -edu.ws - -// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf -yt - -// IDN ccTLDs -// Please sort by ISO 3166 ccTLD, then punicode string -// when submitting patches and follow this format: -// <Punicode> ("<english word>" <language>) : <ISO 3166 ccTLD> -// [optional sponsoring org] -// <URL> - -// xn--mgbaam7a8h ("Emerat" Arabic) : AE -// http://nic.ae/english/arabicdomain/rules.jsp -امارات - -// xn--54b7fta0cc ("Bangla" Bangla) : BD -বাংলা - -// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhongguo>) : CN -// CNNIC -// http://cnnic.cn/html/Dir/2005/10/11/3218.htm -中国 - -// xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhongguo>) : CN -// CNNIC -// http://cnnic.cn/html/Dir/2005/10/11/3218.htm -中國 - -// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ -الجزائر - -// xn--wgbh1c ("Egypt" Arabic .masr) : EG -// http://www.dotmasr.eg/ -مصر - -// xn--node ("ge" Georgian (Mkhedruli)) : GE -გე - -// xn--j6w193g ("Hong Kong" Chinese-Han) : HK -// https://www2.hkirc.hk/register/rules.jsp -香港 - -// xn--h2brj9c ("Bharat" Devanagari) : IN -// India -भारत - -// xn--mgbbh1a71e ("Bharat" Arabic) : IN -// India -بھارت - -// xn--fpcrj9c3d ("Bharat" Telugu) : IN -// India -భారత్ - -// xn--gecrj9c ("Bharat" Gujarati) : IN -// India -ભારત - -// xn--s9brj9c ("Bharat" Gurmukhi) : IN -// India -ਭਾਰਤ - -// xn--45brj9c ("Bharat" Bengali) : IN -// India -ভারত - -// xn--xkc2dl3a5ee0h ("India" Tamil) : IN -// India -இந்தியா - -// xn--mgba3a4f16a ("Iran" Persian) : IR -ایران - -// xn--mgba3a4fra ("Iran" Arabic) : IR -ايران - -// xn--mgbayh7gpa ("al-Ordon" Arabic) : JO -// National Information Technology Center (NITC) -// Royal Scientific Society, Al-Jubeiha -الاردن - -// xn--3e0b707e ("Republic of Korea" Hangul) : KR -한국 - -// xn--80ao21a ("Kaz" Kazakh) : KZ -қаз - -// xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK -// http://nic.lk -ලංකා - -// xn--xkc2al3hye2a ("Ilangai" Tamil) : LK -// http://nic.lk -இலங்கை - -// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA -المغرب - -// xn--l1acc ("mon" Mongolian) : MN -мон - -// xn--mgbx4cd0ab ("Malaysia" Malay) : MY -مليسيا - -// xn--mgb9awbf ("Oman" Arabic) : OM -عمان - -// 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/ -قطر - -// xn--mgberp4a5d4ar ("AlSaudiah" Arabic) : SA -// http://www.nic.net.sa/ -السعودية - -// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA -السعودیة - -// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA -السعودیۃ - -// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA -السعوديه - -// xn--ogbpf8fl ("Syria" Arabic) : SY -سورية - -// xn--mgbtf8fl ("Syria" Arabic) variant : SY -سوريا - -// xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG -新加坡 - -// xn--clchc0ea0b2g2a9gcd ("Singapore" Tamil) : SG -சிங்கப்பூர் - -// xn--o3cw4h ("Thai" Thai) : TH -// http://www.thnic.co.th -ไทย - -// xn--pgbs0dh ("Tunis") : TN -// http://nic.tn -تونس - -// xn--kpry57d ("Taiwan" Chinese-Han-Traditional) : TW -// http://www.twnic.net/english/dn/dn_07a.htm -台灣 - -// xn--kprw13d ("Taiwan" Chinese-Han-Simplified) : TW -// http://www.twnic.net/english/dn/dn_07a.htm -台湾 - -// xn--nnx388a ("Taiwan") variant : TW -臺灣 - -// xn--j1amh ("ukr" Cyrillic) : UA -укр - -// xn--mgb2ddes ("AlYemen" Arabic) : YE -اليمن - -// xxx : http://icmregistry.com -xxx - -// ye : http://www.y.net.ye/services/domain_name.htm -*.ye - -// za : http://www.zadna.org.za/slds.html -*.za - -// zm : http://en.wikipedia.org/wiki/.zm -*.zm - -// zw : http://en.wikipedia.org/wiki/.zw -*.zw - - -// xn--80asehdb : 2013-07-14 CORE Association -онлайн - -// xn--80aswg : 2013-07-14 CORE Association -сайт - -// xn--ngbc5azd : 2013-07-14 International Domain Registry Pty. Ltd. -شبكة - -// xn--unup4y : 2013-07-14 Spring Fields, LLC -游戏 - -// xn--vhquv : 2013-08-28 Dash McCook, LLC -企业 - -// camera : 2013-08-28 Atomic Maple, LLC -camera - -// clothing : 2013-08-28 Steel Lake, LLC -clothing - -// lighting : 2013-08-28 John McCook, LLC -lighting - -// singles : 2013-08-28 Fern Madison, LLC -singles - -// ventures : 2013-08-28 Binky Lake, LLC -ventures - -// voyage : 2013-08-28 Ruby House, LLC -voyage - -// guru : 2013-08-28 Pioneer Cypress, LLC -guru - -// holdings : 2013-08-28 John Madison, LLC -holdings - -// equipment : 2013-08-28 Corn Station, LLC -equipment - -// bike : 2013-08-28 Grand Hollow, LLC -bike - -// estate : 2013-08-28 Trixy Park, LLC -estate - -// tattoo : 2013-08-30 Uniregistry,Corp. -tattoo - -// xn--3ds443g : 2013-09-09 TLD Registry Limited -在线 - -// xn--fiq228c5hs : 2013-09-09 TLD Registry Limited -中文网 - -// land : 2013-09-10 Pine Moon, LLC -land - -// plumbing : 2013-09-10 Spring Tigers, LLC -plumbing - -// contractors : 2013-09-10 Magic Woods, LLC -contractors - -// sexy : 2013-09-11 Uniregistry,Corp. -sexy - -// menu : 2013-09-11 Wedding TLD2, LLC -menu - -// xn--rhqv96g : 2013-09-11 Stable Tone Limited -世界 - -// uno : 2013-09-11 Dot Latin, LLC -uno - -// gallery : 2013-09-13 Sugar House, LLC -gallery - -// technology : 2013-09-13 Auburn Falls -technology - -// xn--3bst00m : 2013-09-13 Eagle Horizon Limited -集团 - -// reviews : 2013-09-13 Extra Cover, LLC -reviews - -// guide : 2013-09-13 Snow Moon, LLC -guide - -// xn--6qq986b3x1 : 2013-09-13 Tycoon Treasure Limited -我爱你 - -// graphics : 2013-09-13 Over Madison, LLC -graphics - -// construction : 2013-09-13 Fox Dynamite, LLC -construction - -// onl : 2013-09-16 I-Registry Ltd. -onl - -// xn--q9jyb4c : 2013-09-17 Charleston Road Registry -みんな - -// diamonds : 2013-09-23 John Edge, LLC -diamonds - -// kiwi : 2013-09-23 Dot Kiwi Limited -kiwi - -// enterprises : 2013-09-23 Snow Oaks LLC -enterprises - -// today : 2013-09-23 Pearl Woods, LLC -today - -// futbol : 2013-09-23 Atomic Falls, LLC -futbol - -// photography : 2013-09-23 Sugar Glen, LLC -photography - -// tips : 2013-09-23 Corn Willow, LLC -tips - -// directory : 2013-09-23 Extra Madison, LLC -directory - -// kitchen : 2013-09-23 Just Goodbye, LLC -kitchen - -// xn--6frz82g : 2013-09-24 Afilias Limited -移动 - -// kim : 2013-09-24 Afilias Limited -kim - -// xn--cg4bki : 2013-09-27 Samsung SDS Co., LTD -삼성 - -// monash : 2013-10-01 Monash University -monash - -// wed : 2013-10-02 Atgron, Inc. -wed - -// pink : 2013-10-02 Afilias Limited -pink - -// ruhr : 2013-10-02 regiodot GmbH & Co. KG -ruhr - -// buzz : 2013-10-03 DOTSTRATEGY CO. -buzz - -// careers : 2013-10-03 Wild Corner, LLC -careers - -// shoes : 2013-10-03 Binky Galley, LLC -shoes - -// xn--4gbrim : 2013-10-07 Suhub Electronic Establishment -موقع - -// career : 2013-10-09 dotCareer, LLC -career - -// otsuka : 2013-10-11 Otsuka Holdings Co. Ltd. -otsuka - -// xn--fiQ64b : 2013-10-14 CITIC Group Corporation -中信 - -// gift : 2013-10-18 Uniregistry Corp. -gift - -// recipes : 2013-10-18 Grand Island, LLC -recipes - -// coffee : 2013-10-18 Trixy Cover, LLC -coffee - -// luxury : 2013-10-18 Luxury Partners, LLC -luxury - -// domains : 2013-10-18 Sugar Cross, LLC -domains - -// photos : 2013-10-18 Sea Corner, LLC -photos - -// limo : 2013-10-18 Hidden Frostbite, LLC -limo - -// viajes : 2013-10-18 Black Madison, LLC -viajes - -// wang : 2013-10-24 Zodiac Leo Limited -wang - -// democrat : 2013-10-24 United TLD Holdco Ltd. -democrat - -// mango : 2013-10-25 PUNTO FA S.L. -mango - -// cab : 2013-10-25 Half Sunset, LLC -cab - -// support : 2013-10-25 Grand Orchard, LLC -support - -// dance : 2013-10-25 United TLD Holdco Ltd. -dance - -// nagoya : 2013-10-25 GMO Registry, Inc. -nagoya - -// computer : 2013-10-25 Pine Mill, LLC -computer - -// wien : 2013-10-28 punkt.wien GmbH -wien - -// berlin : 2013-10-31 dotBERLIN GmbH & Co. KG -berlin - -// codes : 2013-10-31 Puff Willow, LLC -codes - -// email : 2013-10-31 Spring Madison, LLC -email - -// xn--mgbab2bd : 2013-10-31 CORE Association -بازار - -// repair : 2013-11-07 Lone Sunset, LLC -repair - -// holiday : 2013-11-07 Goose Woods, LLC -holiday - -// center : 2013-11-07 Tin Mill, LLC -center - -// systems : 2013-11-07 Dash Cypress, LLC -systems - -// wiki : 2013-11-07 Top Level Design, LLC -wiki - -// ceo : 2013-11-07 CEOTLD Pty Ltd -ceo - -// international : 2013-11-07 Wild Way, LLC -international - -// solar : 2013-11-07 Ruby Town, LLC -solar - -// company : 2013-11-07 Silver Avenue, LLC -company - -// education : 2013-11-07 Brice Way, LLC -education - -// training : 2013-11-07 Wild Willow, LLC -training - -// academy : 2013-11-07 Half Oaks, LLC -academy - -// marketing : 2013-11-07 Fern Pass, LLC -marketing - -// florist : 2013-11-08 Half Cypress, LLC -florist - -// solutions : 2013-11-07 Silver Cover, LLC -solutions - -// build : 2013-11-07 Plan Bee LLC -build - -// institute : 2013-11-07 Outer Maple, LLC -institute - -// builders : 2013-11-07 Atomic Madison, LLC -builders - -// red : 2013-11-07 Afilias Limited -red - -// blue : 2013-11-07 Afilias Limited -blue - -// ninja : 2013-11-07 United TLD Holdco Ltd. -ninja - -// business : 2013-11-07 Spring Cross, LLC -business - -// gal : 2013-11-07 Asociación puntoGAL -gal - -// social : 2013-11-07 United TLD Holdco Ltd. -social - -// house : 2013-11-07 Sugar Park, LLC -house - -// camp : 2013-11-07 Delta Dynamite, LLC -camp - -// immobilien : 2013-11-07 United TLD Holdco Ltd. -immobilien - -// moda : 2013-11-07 United TLD Holdco Ltd. -moda - -// glass : 2013-11-07 Black Cover, LLC -glass - -// management : 2013-11-07 John Goodbye, LLC -management - -// kaufen : 2013-11-07 United TLD Holdco Ltd. -kaufen - -// farm : 2013-11-07 Just Maple, LLC -farm - -// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center -公益 - -// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center -政务 - -// club : 2013-11-08 .CLUB DOMAINS, LLC -club - -// voting : 2013-11-13 Valuetainment Corp. -voting - -// TOKYO : 2013-11-13 GMO Registry, Inc. -tokyo - -// moe : 2013-11-13 Interlink Co., Ltd. -moe - -// guitars : 2013-11-14 Uniregistry, Corp. -guitars - -// bargains : 2013-11-14 Half Hallow, LLC -bargains - -// xn--nqv7fs00ema : 2013-11-14 Public Interest Registry -组织机构 - -// desi : 2013-11-14 Desi Networks LLC -desi - -// cool : 2013-11-14 Koko Lake, LLC -cool - -// boutique : 2013-11-14 Over Galley, LLC -boutique - -// pics : 2013-11-14 Uniregistry, Corp. -pics - -// xn--c1avg : 2013-11-14 Public Interest Registry -орг - -// xn--55qx5d : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） -公司 - -// xn--io0a7i : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） -网络 - -// cheap : 2013-11-14 Sand Cover, LLC -cheap - -// xn--xhq521b : 2013-11-14 Guangzhou YU Wei Information Technology Co., Ltd. -广东 - -// photo : 2013-11-14 Uniregistry, Corp. -photo - -// network : 2013-11-14 Trixy Manor, LLC -network - -// zone : 2013-11-14 Outer Falls, LLC -zone - -// xn--nqv7f : 2013-11-14 Public Interest Registry -机构 - -// link : 2013-11-14 Uniregistry, Corp. -link - -// QPON : 2013-11-14 dotCOOL, Inc. -qpon - -// xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry -संगठन - -// agency : 2013-11-14 Steel Falls, LLC -agency - -// tienda : 2013-11-14 Victor Manor, LLC -tienda - -// works : 2013-11-14 Little Dynamite, LLC -works - -// london : 2013-11-14 Dot London Domains Limited -london - -// watch : 2013-11-14 Sand Shadow, LLC -watch - -// rocks : 2013-11-14 Ruby Moon, LLC -rocks - -// SHIKSHA : 2013-11-14 Afilias Limited -shiksha - -// xn--d1acj3b : 2013-11-21 The Foundation for Network Initiatives “The Smart Internet” -дети - -// budapest : 2013-11-21 Top Level Domain Holdings Limited -budapest - -// nrw : 2013-11-21 Minds + Machines GmbH -nrw - -// VOTE : 2013-11-21 Monolith Registry LLC -vote - -// fishing : 2013-11-21 Top Level Domain Holdings Limited -fishing - -// expert : 2013-11-21 Magic Pass, LLC -expert - -// horse : 2013-11-21 Top Level Domain Holdings Limited -horse - -// christmas : 2013-11-21 Uniregistry, Corp. -christmas - -// cooking : 2013-11-21 Top Level Domain Holdings Limited -cooking - -// xn--czru2d : 2013-11-21 Zodiac Capricorn Limited -商城 - -// casa : 2013-11-21 Top Level Domain Holdings Limited -casa - -// rich : 2013-11-21 I-REGISTRY Ltd., Niederlassung Deutschland -rich - -// VOTO : 2013-11-21 Monolith Registry LLC -voto - -// tools : 2013-11-21 Pioneer North, LLC -tools - -// xn--45q11c : 2013-11-21 Zodiac Scorpio Limited -八卦 - -// praxi : 2013-12-05 Praxi S.p.A. -praxi - -// events : 2013-12-05 Pioneer Maple, LLC -events - -// flights : 2013-12-05 Fox Station, LLC -flights - -// report : 2013-12-05 Binky Glen, LLC -report - -// partners : 2013-12-05 Magic Glen, LLC -partners - -// neustar : 2013-12-05 NeuStar, Inc. -neustar - -// rentals : 2013-12-05 Big Hollow,LLC -rentals - -// catering : 2013-12-05 New Falls. LLC -catering - -// community : 2013-12-05 Fox Orchard, LLC -community - -// maison : 2013-12-05 Victor Frostbite, LLC -maison - -// parts : 2013-12-05 Sea Goodbye, LLC -parts - -// cleaning : 2013-12-05 Fox Shadow, LLC -cleaning - -// okinawa : 2013-12-05 BusinessRalliart inc. -okinawa - -// foundation : 2013-12-05 John Dale, LLC -foundation - -// properties : 2013-12-05 Big Pass, LLC -properties - -// vacations : 2013-12-05 Atomic Tigers, LLC -vacations - -// productions : 2013-12-05 Magic Birch, LLC -productions - -// industries : 2013-12-05 Outer House, LLC -industries - -// haus : 2013-12-05 Pixie Edge, LLC -haus - -// vision : 2013-12-05 Koko Station, LLC -vision - -// mormon : 2013-12-05 IRI Domain Management, LLC (""Applicant"") -mormon - -// cards : 2013-12-05 Foggy Hollow, LLC -cards - -// ink : 2013-12-05 Top Level Design, LLC -ink - -// villas : 2013-12-05 New Sky, LLC -villas - -// consulting : 2013-12-05 Pixie Station, LLC -consulting - -// cruises : 2013-12-05 Spring Way, LLC -cruises - -// krd : 2013-12-05 KRG Department of Information Technology -krd - -// xyz : 2013-12-05 XYZ.COM LLC -xyz - -// dating : 2013-12-05 Pine Fest, LLC -dating - -// exposed : 2013-12-05 Victor Beach, LLC -exposed - -// condos : 2013-12-05 Pine House, LLC -condos - -// eus : 2013-12-12 Puntueus Fundazioa -eus - -// Caravan : 2013-12-12 Caravan International, Inc. -caravan - -// actor : 2013-12-12 United TLD Holdco Ltd. -actor - -// saarland : 2013-12-12 dotSaarland GmbH -saarland - -// yokohama : 2013-12-12 GMO Registry, Inc. -yokohama - -// pub : 2013-12-12 United TLD Holdco Ltd. -pub - -// xn--p1acf : 2013-12-12 Rusnames Limited -рус - -// ren : 2013-12-12 Beijing Qianxiang Wangjing Technology Development Co., Ltd. -ren - -// fish : 2013-12-12 Fox Woods, LLC -fish - -// BAR : 2013-12-12 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable -bar - -// DNP : 2013-12-13 Dai Nippon Printing Co., Ltd. -dnp - -// bid : 2013-12-19 dot Bid Limited -bid - -// supply : 2013-12-19 Half Falls, LLC -supply - -// Miami : 2013-12-19 Top Level Domain Holdings Limited -miami - -// supplies : 2013-12-19 Atomic Fields, LLC -supplies - -// quebec : 2013-12-19 PointQuébec Inc -quebec - -// MOSCOW : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) -moscow - -// globo : 2013-12-19 Globo Comunicação e Participações S.A -globo - -// AXA : 2013-12-19 AXA SA -axa - -// xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) -москва - -// xn--czrs0t : 2013-12-19 Wild Island, LLC -商店 - -// vodka : 2013-12-19 Top Level Domain Holdings Limited -vodka - -// REST : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable -rest - -// frogans : 2013-12-19 OP3FT -frogans - -// WTC : 2013-12-19 World Trade Centers Association, Inc. -wtc - -// rodeo : 2013-12-19 Top Level Domain Holdings Limited -rodeo - -// sohu : 2013-12-19 Sohu.com Limited -sohu - -// BEST : 2013-12-19 BestTLD Pty Ltd -best - -// country : 2013-12-19 Top Level Domain Holdings Limited -country - -// KRED : 2013-12-19 KredTLD Pty Ltd -kred - -// feedback : 2013-12-19 Top Level Spectrum, Inc. -feedback - -// work : 2013-12-19 Top Level Domain Holdings Limited -work - -// luxe : 2014-01-09 Top Level Domain Holdings Limited -luxe - -// ryukyu : 2014-01-09 BusinessRalliart inc. -ryukyu - -// autos : 2014-01-09 DERAutos, LLC -autos - -// homes : 2014-01-09 DERHomes, LLC -homes - -// jetzt : 2014-01-09 New TLD Company AB -jetzt - -// yachts : 2014-01-09 DERYachts, LLC -yachts - -// motorcycles : 2014-01-09 DERMotorcycles, LLC -motorcycles - -// mini : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft -mini - -// ggee : 2014-01-09 GMO Internet, Inc. -ggee - -// beer : 2014-01-09 Top Level Domain Holdings Limited -beer - -// xn--1qqw23a : 2014-01-13 Guangzhou YU Wei Information Technology Co., Ltd. -佛山 - -// college : 2014-01-16 XYZ.COM LLC -college - -// ovh : 2014-01-16 OVH SAS -ovh - -// meet : 2014-01-16 Afilias Limited -meet - -// xn--ses554g : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED -网址 - -// gop : 2014-01-16 Republican State Leadership Committee, Inc. -gop - -// blackfriday : 2014-01-16 Uniregistry, Corp. -blackfriday - -// lacaixa : 2014-01-16 CAIXA D'ESTALVIS I PENSIONS DE BARCELONA -lacaixa - -// xn--czr694b : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES(HOLDING) COMPANY.HONGKONG LIMITED -商标 - -// vegas : 2014-01-16 Dot Vegas, Inc. -vegas - -// black : 2014-01-16 Afilias Limited -black - -// soy : 2014-01-23 Charleston Road Registry Inc. -soy - -// trade : 2014-01-23 Elite Registry Limited -trade - -// gent : 2014-01-23 COMBELL GROUP NV/SA -gent - -// ing : 2014-01-23 Charleston Road Registry Inc. -ing - -// dad : 2014-01-23 Charleston Road Registry Inc. -dad - -// shriram : 2014-01-23 Shriram Capital Ltd. -shriram - -// bayern : 2014-01-23 Bayern Connect GmbH -bayern - -// scot : 2014-01-23 Dot Scot Registry Limited -scot - -// webcam : 2014-01-23 dot Webcam Limited -webcam - -// foo : 2014-01-23 Charleston Road Registry Inc. -foo - -// eat : 2014-01-23 Charleston Road Registry Inc. -eat - -// nyc : 2014-01-23 The City of New York -nyc - -// prod : 2014-01-23 Charleston Road Registry Inc. -prod - -// how : 2014-01-23 Charleston Road Registry Inc. -how - -// day : 2014-01-30 Charleston Road Registry Inc. -day - -// meme : 2014-01-30 Charleston Road Registry Inc. -meme - -// mov : 2014-01-30 Charleston Road Registry Inc. -mov - -// paris : 2014-01-30 City of Paris -paris - -// boo : 2014-01-30 Charleston Road Registry Inc. -boo - -// new : 2014-01-30 Charleston Road Registry Inc. -new - -// ifm : 2014-01-30 ifm electronic gmbh -ifm - -// life : 2014-02-06 Trixy Oaks, LLC -life - -// archi : 2014-02-06 STARTING DOT LIMITED -archi - -// spiegel : 2014-02-06 SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG -spiegel - -// brussels : 2014-02-06 DNS.be vzw -brussels - -// church : 2014-02-06 Holly Fileds, LLC -church - -// here : 2014-02-06 Charleston Road Registry Inc. -here - -// dabur : 2014-02-06 Dabur India Limited -dabur - -// vlaanderen : 2014-02-06 DNS.be vzw -vlaanderen - -// cologne : 2014-02-06 NetCologne Gesellschaft für Telekommunikation mbH -cologne - -// xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd -手机 - -// wme : 2014-02-13 William Morris Endeavor Entertainment, LLC -wme - -// nhk : 2014-02-13 Japan Broadcasting Corporation (NHK) -nhk - -// suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION -suzuki - -// whoswho : 2014-02-20 Who's Who Registry -whoswho - -// scb : 2014-02-20 The Siam Commercial Bank Public Company Limited ("SCB""\) -scb - -// hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH -hamburg - -// services : 2014-02-27 Fox Castle, LLC -services - -// bzh : 2014-02-27 Association www.bzh -bzh - -// rio : 2014-02-27 Empresa Municipal de Informática SA - IPLANRIO -rio - -// cash : 2014-03-07 Delta Lake, LLC -cash - -// gives : 2014-03-07 United TLD Holdco Ltd. -gives - -// hiphop : 2014-03-07 Uniregistry, Corp. -hiphop - -// degree : 2014-03-07 Puff House, LLC -degree - -// digital : 2014-03-07 Dash Park, LLC -digital - -// rehab : 2014-03-07 United TLD Holdco Ltd. -rehab - -// wtf : 2014-03-07 Hidden Way, LLC -wtf - -// financial : 2014-03-07 Just Cover, LLC -financial - -// limited : 2014-03-07 Big Fest, LLC -limited - -// discount : 2014-03-07 Holly Hill, LLC -discount - -// fail : 2014-03-07 Atomic Pipe, LLC -fail - -// vet : 2014-03-07 Wild Dale, LLC -vet - -// ngo : 2014-03-07 Public Interest Registry -ngo - -// fitness : 2014-03-07 Brice Orchard, LLC -fitness - -// schule : 2014-03-07 Outer Moon, LLC -schule - -// navy : 2014-03-07 United TLD Holdco Ltd. -navy - -// bio : 2014-03-07 STARTING DOT LIMITED -bio - -// ong : 2014-03-07 Public Interest Registry -ong - -// town : 2014-03-07 Koko Moon, LLC -town - -// toys : 2014-03-07 Pioneer Orchard, LLC -toys - -// army : 2014-03-07 United TLD Holdco Ltd. -army - -// engineering : 2014-03-07 Romeo Canyon -engineering - -// capital : 2014-03-07 Delta Mill, LLC -capital - -// exchange : 2014-03-07 Spring Falls, LLC -exchange - -// fan : 2014-03-07 Goose Glen, LLC -fan - -// market : 2014-03-07 Victor Way, LLC -market - -// media : 2014-03-07 Grand Glen, LLC -media - -// lease : 2014-03-07 Victor Trail, LLC -lease - -// university : 2014-03-07 Little Station, LLC -university - -// reisen : 2014-03-07 New Cypress, LLC -reisen - -// airforce : 2014-03-07 United TLD Holdco Ltd. -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 - -// 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 - -// 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 +lib.de.us +lib.fl.us +lib.ga.us +lib.gu.us +lib.hi.us +lib.ia.us +lib.id.us +lib.il.us +lib.in.us +lib.ks.us +lib.ky.us +lib.la.us +lib.ma.us +lib.md.us +lib.me.us +lib.mi.us +lib.mn.us +lib.mo.us +lib.ms.us +lib.mt.us +lib.nc.us +lib.nd.us +lib.ne.us +lib.nh.us +lib.nj.us +lib.nm.us +lib.nv.us +lib.ny.us +lib.oh.us +lib.ok.us +lib.or.us +lib.pa.us +lib.pr.us +lib.ri.us +lib.sc.us +lib.sd.us +lib.tn.us +lib.tx.us +lib.ut.us +lib.vi.us +lib.vt.us +lib.va.us +lib.wa.us +lib.wi.us +lib.wv.us +lib.wy.us -// website : 2014-04-03 DotWebsite Inc. -website +// k12.ma.us contains school districts in Massachusetts. The 4LDs are +// managed indepedently except for private (PVT), charter (CHTR) and +// parochial (PAROCH) schools. Those are delegated dorectly to the +// 5LD operators. <k12-ma-hostmaster _ at _ rsuc.gweep.net> +pvt.k12.ma.us +chtr.k12.ma.us +paroch.k12.ma.us -// space : 2014-04-03 DotSpace Inc. -space +// uy : http://www.nic.org.uy/ +uy +com.uy +edu.uy +gub.uy +mil.uy +net.uy +org.uy -// schmidt : 2014-04-03 SALM S.A.S. -schmidt +// uz : http://www.reg.uz/ +uz +co.uz +com.uz +net.uz +org.uz -// cuisinella : 2014-04-03 SALM S.A.S. -cuisinella +// va : http://en.wikipedia.org/wiki/.va +va -// samsung : 2014-04-03 SAMSUNG SDS CO., LTD -samsung +// vc : http://en.wikipedia.org/wiki/.vc +// Submitted by registry <kshah(a)ca.afilias.info> 2008-06-13 +vc +com.vc +net.vc +org.vc +gov.vc +mil.vc +edu.vc -// crs : 2014-04-03 Federated Co operatives Limited -crs +// ve : https://registro.nic.ve/ +// Confirmed by registry 2012-10-04 +ve +co.ve +com.ve +e12.ve +edu.ve +gov.ve +info.ve +mil.ve +net.ve +org.ve +web.ve -// doosan : 2014-04-03 Doosan Corporation -doosan +// vg : http://en.wikipedia.org/wiki/.vg +vg -// press : 2014-04-03 DotPress Inc. -press +// 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 +// are available for registration (which they do not seem to be). +vi +co.vi +com.vi +k12.vi +net.vi +org.vi -// emerck : 2014-04-03 Merck KGaA -emerck +// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp +vn +com.vn +net.vn +org.vn +edu.vn +gov.vn +int.vn +ac.vn +biz.vn +info.vn +name.vn +pro.vn +health.vn -// erni : 2014-04-03 ERNI Group Holding AG -erni +// vu : http://en.wikipedia.org/wiki/.vu +// list of 2nd level tlds ? +vu -// direct : 2014-04-10 Half Trail, LLC -direct +// wf : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf +wf -// yandex : 2014-04-10 YANDEX, LLC -yandex +// ws : http://en.wikipedia.org/wiki/.ws +// http://samoanic.ws/index.dhtml +ws +com.ws +net.ws +org.ws +gov.ws +edu.ws -// lotto : 2014-04-10 Afilias Limited -lotto +// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf +yt -// toshiba : 2014-04-10 TOSHIBA Corporation -toshiba +// IDN ccTLDs +// Please sort by ISO 3166 ccTLD, then punicode string +// when submitting patches and follow this format: +// <Punicode> ("<english word>" <language>) : <ISO 3166 ccTLD> +// [optional sponsoring org] +// <URL> -// bauhaus : 2014-04-17 Werkhaus GmbH -bauhaus +// xn--mgbaam7a8h ("Emerat" Arabic) : AE +// http://nic.ae/english/arabicdomain/rules.jsp +امارات -// host : 2014-04-17 DotHost Inc. -host +// xn--54b7fta0cc ("Bangla" Bangla) : BD +বাংলা -// ltda : 2014-04-17 DOMAIN ROBOT SERVICOS DE HOSPEDAGEM NA INTERNET LTDA -ltda +// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhonggou>) : CN +// CNNIC +// http://cnnic.cn/html/Dir/2005/10/11/3218.htm +中国 -// global : 2014-04-17 Dot GLOBAL AS -global +// xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhonggou>) : CN +// CNNIC +// http://cnnic.cn/html/Dir/2005/10/11/3218.htm +中國 -// abogado : 2014-04-24 Top Level Domain Holdings Limited -abogado +// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ +الجزائر -// place : 2014-04-24 Snow Galley, LLC -place +// xn--wgbh1c ("Egypt" Arabic .masr) : EG +// http://www.dotmasr.eg/ +مصر -// tirol : 2014-04-24 punkt Tirol GmbH -tirol +// xn--node ("ge" Georgian (Mkhedruli)) : GE +გე -// gmx : 2014-04-24 1&1 Mail & Media GmbH -gmx +// xn--j6w193g ("Hong Kong" Chinese-Han) : HK +// https://www2.hkirc.hk/register/rules.jsp +香港 -// tatar : 2014-04-24 Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic" -tatar +// xn--h2brj9c ("Bharat" Devanagari) : IN +// India +भारत -// scholarships : 2014-04-24 Scholarships.com, LLC -scholarships +// xn--mgbbh1a71e ("Bharat" Arabic) : IN +// India +بھارت -// eurovision : 2014-04-24 European Broadcasting Union (EBU) -eurovision +// xn--fpcrj9c3d ("Bharat" Telugu) : IN +// India +భారత్ -// wedding : 2014-04-24 Top Level Domain Holdings Limited -wedding +// xn--gecrj9c ("Bharat" Gujarati) : IN +// India +ભારત -// active : 2014-05-01 The Active Network, Inc -active +// xn--s9brj9c ("Bharat" Gurmukhi) : IN +// India +ਭਾਰਤ -// madrid : 2014-05-01 Comunidad de Madrid -madrid +// xn--45brj9c ("Bharat" Bengali) : IN +// India +ভারত -// youtube : 2014-05-01 Charleston Road Registry Inc. -youtube +// xn--xkc2dl3a5ee0h ("India" Tamil) : IN +// India +இந்தியா -// sharp : 2014-05-01 Sharp Corporation -sharp +// xn--mgba3a4f16a ("Iran" Persian) : IR +ایران -// uol : 2014-05-01 UBN INTERNET LTDA. -uol +// xn--mgba3a4fra ("Iran" Arabic) : IR +ايران -// physio : 2014-05-01 PhysBiz Pty Ltd -physio +// xn--mgbayh7gpa ("al-Ordon" Arabic) : JO +// National Information Technology Center (NITC) +// Royal Scientific Society, Al-Jubeiha +الاردن -// gmail : 2014-05-01 Charleston Road Registry Inc. -gmail +// xn--3e0b707e ("Republic of Korea" Hangul) : KR +한국 -// channel : 2014-05-08 Charleston Road Registry Inc. -channel +// xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK +// http://nic.lk +ලංකා -// fly : 2014-05-08 Charleston Road Registry Inc. -fly +// xn--xkc2al3hye2a ("Ilangai" Tamil) : LK +// http://nic.lk +இலங்கை -// zip : 2014-05-08 Charleston Road Registry Inc. -zip +// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA +المغرب -// esq : 2014-05-08 Charleston Road Registry Inc. -esq +// xn--mgb9awbf ("Oman" Arabic) : OM +عمان -// rsvp : 2014-05-08 Charleston Road Registry Inc. -rsvp +// xn--ygbi2ammx ("Falasteen" Arabic) : PS +// The Palestinian National Internet Naming Authority (PNINA) +// http://www.pnina.ps +فلسطين -// wales : 2014-05-08 Nominet UK -wales +// xn--90a3ac ("srb" Cyrillic) : RS +срб -// cymru : 2014-05-08 Nominet UK -cymru +// xn--p1ai ("rf" Russian-Cyrillic) : RU +// http://www.cctld.ru/en/docs/rulesrf.php +рф -// green : 2014-05-08 Afilias Limited -green +// xn--wgbl6a ("Qatar" Arabic) : QA +// http://www.ict.gov.qa/ +قطر -// lgbt : 2014-05-08 Afilias Limited -lgbt +// xn--mgberp4a5d4ar ("AlSaudiah" Arabic) : SA +// http://www.nic.net.sa/ +السعودية -// xn--hxt814e : 2014-05-15 Zodiac Libra Limited -网店 +// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA +السعودیة -// cancerresearch : 2014-05-15 Australian Cancer Research Foundation -cancerresearch +// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA +السعودیۃ -// everbank : 2014-05-15 EverBank -everbank +// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA +السعوديه -// frl : 2014-05-15 FRLregistry B.V. -frl +// xn--ogbpf8fl ("Syria" Arabic) : SY +سورية -// property : 2014-05-22 Uniregistry, Corp. -property +// xn--mgbtf8fl ("Syria" Arabic) variant : SY +سوريا -// forsale : 2014-05-22 Sea Oaks, LLC -forsale +// xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG +新加坡 -// seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal) -seat +// xn--clchc0ea0b2g2a9gcd ("Singapore" Tamil) : SG +சிங்கப்பூர் -// deals : 2014-05-22 Sand Sunset, LLC -deals +// xn--o3cw4h ("Thai" Thai) : TH +// http://www.thnic.co.th +ไทย -// nra : 2014-05-22 NRA Holdings Company, INC. -nra +// xn--pgbs0dh ("Tunis") : TN +// http://nic.tn +تونس -// xn--fjq720a : 2014-05-22 Will Bloom, LLC -娱乐 +// xn--kpry57d ("Taiwan" Chinese-Han-Traditional) : TW +// http://www.twnic.net/english/dn/dn_07a.htm +台灣 -// realtor : 2014-05-29 Real Estate Domains LLC -realtor +// xn--kprw13d ("Taiwan" Chinese-Han-Simplified) : TW +// http://www.twnic.net/english/dn/dn_07a.htm +台湾 -// bnpparibas : 2014-05-29 BNP Paribas -bnpparibas +// xn--nnx388a ("Taiwan") variant : TW +臺灣 -// melbourne : 2014-05-29 The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation -melbourne +// xn--j1amh ("ukr" Cyrillic) : UA +укр -// hosting : 2014-05-29 Uniregistry, Corp. -hosting +// xn--mgb2ddes ("AlYemen" Arabic) : YE +اليمن -// yoga : 2014-05-29 Top Level Domain Holdings Limited -yoga +// xxx : http://icmregistry.com +xxx -// city : 2014-05-29 Snow Sky, LLC -city +// ye : http://www.y.net.ye/services/domain_name.htm +*.ye -// bond : 2014-06-05 Bond University Limited -bond +// za : http://www.zadna.org.za/slds.html +*.za -// click : 2014-06-05 Uniregistry, Corp. -click +// zm : http://en.wikipedia.org/wiki/.zm +*.zm -// cern : 2014-06-05 European Organization for Nuclear Research ("CERN") -cern +// zw : http://en.wikipedia.org/wiki/.zw +*.zw // ===END ICANN DOMAINS=== // ===BEGIN PRIVATE DOMAINS=== // Amazon CloudFront : https://aws.amazon.com/cloudfront/ -// Submitted by Donavan Miller <donavanm(a)amazon.com> 2013-03-22 +// Requested by Donavan Miller <donavanm(a)amazon.com> 2013-03-22 cloudfront.net // Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/ -// Submitted by Osman Surkatty <osmans(a)amazon.com> 2014-05-20 +// Requested by Osman Surkatty <osmans(a)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 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(a)amazon.com> 2013-04-02 +// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/ +// Requested by Adam Stein <astein(a)amazon.com> 2013-04-02 elasticbeanstalk.com // Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/ -// Submitted by Scott Vidmar <svidmar(a)amazon.com> 2013-03-27 +// Requested by Scott Vidmar <svidmar(a)amazon.com> 2013-03-27 elb.amazonaws.com // Amazon S3 : https://aws.amazon.com/s3/ -// Submitted by Courtney Eckhardt <coec(a)amazon.com> 2013-03-22 +// Requested by Courtney Eckhardt <coec(a)amazon.com> 2013-03-22 s3.amazonaws.com s3-us-west-2.amazonaws.com s3-us-west-1.amazonaws.com @@ -8051,27 +6608,26 @@ s3-website-sa-east-1.amazonaws.com s3-website-us-gov-west-1.amazonaws.com // BetaInABox -// Submitted by adrian(a)betainabox.com 2012-09-13 +// Requested by adrian(a)betainabox.com 2012-09-13 betainabox.com // CentralNic : http://www.centralnic.com/names/domains -// Submitted by registry <gavin.brown(a)centralnic.com> 2012-09-27 +// Requested by registry <gavin.brown(a)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 +gr.com hu.com hu.net jp.net jpn.com kr.com -mex.com no.com qc.com ru.com @@ -8081,38 +6637,13 @@ se.net uk.com uk.net us.com +us.org uy.com -za.bz za.com -// Africa.com Web Solutions Ltd : https://registry.africa.com -// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 -africa.com - -// iDOT Services Limited : http://www.domain.gr.com -// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 -gr.com - -// Radix FZC : http://domains.in.net -// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 -in.net - -// US REGISTRY LLC : http://us.org -// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 -us.org - -// co.com Registry, LLC : https://registry.co.com -// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 -co.com - // c.la : http://www.c.la/ c.la -// cloudControl : https://www.cloudcontrol.com/ -// Submitted by Tobias Wilken <tw(a)cloudcontrol.com> 2013-07-23 -cloudcontrolled.com -cloudcontrolapp.com - // co.ca : http://registry.co.ca/ co.ca @@ -8120,12 +6651,8 @@ co.ca co.nl co.no -// Cupcake : https://cupcake.io/ -// Submitted by Jonathan Rudenberg <jonathan(a)cupcake.io> 2013-10-08 -cupcake.is - // DreamHost : http://www.dreamhost.com/ -// Submitted by Andrew Farmer <andrew.farmer(a)dreamhost.com> 2012-10-02 +// Requested by Andrew Farmer <andrew.farmer(a)dreamhost.com> 2012-10-02 dreamhosters.com // DynDNS.com : http://www.dyndns.com/services/dns/dyndns/ @@ -8409,29 +6936,12 @@ webhop.org worse-than.tv writesthisblog.com -// Fastly Inc. http://www.fastly.com/ -// Submitted by Vladimir Vuksan <vladimir(a)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(a)firebase.com> 2014-01-21 -firebaseapp.com - // GitHub, Inc. -// Submitted by Ben Toews <btoews(a)github.com> 2014-02-06 +// Requested by Ben Toews <btoews(a)github.com> 2013-04-18 github.io -githubusercontent.com - -// GlobeHosting, Inc. -// Submitted by Zoltan Egresi <egresi(a)globehosting.com> 2013-07-12 -ro.com // Google, Inc. -// Submitted by Eduardo Vela <evn(a)google.com> 2012-10-24 +// Requested by Eduardo Vela <evn(a)google.com> 2012-10-24 appspot.com blogspot.be blogspot.bj @@ -8476,15 +6986,14 @@ blogspot.tw codespot.com googleapis.com googlecode.com -withgoogle.com // Heroku : https://www.heroku.com/ -// Submitted by Tom Maher <tmaher(a)heroku.com> 2013-05-02 +// Requested by Tom Maher <tmaher(a)heroku.com> 2013-05-02 herokuapp.com herokussl.com // iki.fi -// Submitted by Hannu Aronsson <haa(a)iki.fi> 2009-11-05 +// Requested by Hannu Aronsson <haa(a)iki.fi> 2009-11-05 iki.fi // info.at : http://www.info.at/ @@ -8494,42 +7003,24 @@ info.at // Michau Enterprises Limited : http://www.co.pl/ co.pl -// Microsoft : http://microsoft.com -// Submitted by Barry Dorrans <bdorrans(a)microsoft.com> 2014-01-24 -azurewebsites.net -azure-mobile.net -cloudapp.net - -// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/ -// Submitted by Jeff Wheelhouse <support(a)nearlyfreespeech.net> 2014-02-02 -nfshost.com - // NYC.mn : http://www.information.nyc.mn -// Submitted by Matthew Brown <mattbrown(a)nyc.mn> 2013-03-11 +// Requested by Matthew Brown <mattbrown(a)nyc.mn> 2013-03-11 nyc.mn -// One Fold Media : http://www.onefoldmedia.com/ -// Submitted by Eddie Jones <eddie(a)onefoldmedia.com> 2014-06-10 -nid.io - // Opera Software, A.S.A. -// Submitted by Yngve Pettersen <yngve(a)opera.com> 2009-11-26 +// Requested by Yngve Pettersen <yngve(a)opera.com> 2009-11-26 operaunite.com -// OutSystems -// Submitted by Duarte Santos <domain-admin(a)outsystemscloud.com> 2014-03-11 -outsystemscloud.com - // Red Hat, Inc. OpenShift : https://openshift.redhat.com/ -// Submitted by Tim Kramer <tkramer(a)rhcloud.com> 2012-10-24 +// Requested by Tim Kramer <tkramer(a)rhcloud.com> 2012-10-24 rhcloud.com // priv.at : http://www.nic.priv.at/ -// Submitted by registry <lendl(a)nic.at> 2008-06-09 +// Requested by registry <lendl(a)nic.at> 2008-06-09 priv.at // ZaNiC : http://www.za.net/ -// Submitted by registry <hostmaster(a)nic.za.net> 2009-10-03 +// Requested by registry <hostmaster(a)nic.za.net> 2009-10-03 za.net za.org diff --git a/netwerk/test/unit/data/test_psl.txt b/netwerk/test/unit/data/test_psl.txt index 35c8ccf..5a75831 100644 --- a/netwerk/test/unit/data/test_psl.txt +++ b/netwerk/test/unit/data/test_psl.txt @@ -60,12 +60,12 @@ checkPublicSuffix('a.b.c.kobe.jp', 'b.c.kobe.jp'); checkPublicSuffix('city.kobe.jp', 'city.kobe.jp'); checkPublicSuffix('www.city.kobe.jp', 'city.kobe.jp'); // TLD with a wildcard rule and exceptions. -checkPublicSuffix('ck', null); -checkPublicSuffix('test.ck', null); -checkPublicSuffix('b.test.ck', 'b.test.ck'); -checkPublicSuffix('a.b.test.ck', 'b.test.ck'); -checkPublicSuffix('www.ck', 'www.ck'); -checkPublicSuffix('www.www.ck', 'www.ck'); +checkPublicSuffix('om', null); +checkPublicSuffix('test.om', null); +checkPublicSuffix('b.test.om', 'b.test.om'); +checkPublicSuffix('a.b.test.om', 'b.test.om'); +checkPublicSuffix('songfest.om', 'songfest.om'); +checkPublicSuffix('www.songfest.om', 'songfest.om'); // US K12. checkPublicSuffix('us', null); checkPublicSuffix('test.us', 'test.us'); @@ -76,23 +76,3 @@ checkPublicSuffix('www.test.ak.us', 'test.ak.us'); checkPublicSuffix('k12.ak.us', null); checkPublicSuffix('test.k12.ak.us', 'test.k12.ak.us'); checkPublicSuffix('www.test.k12.ak.us', 'test.k12.ak.us'); -// IDN labels. -checkPublicSuffix('食狮.com.cn', '食狮.com.cn'); -checkPublicSuffix('食狮.公司.cn', '食狮.公司.cn'); -checkPublicSuffix('www.食狮.公司.cn', '食狮.公司.cn'); -checkPublicSuffix('shishi.公司.cn', 'shishi.公司.cn'); -checkPublicSuffix('公司.cn', null); -checkPublicSuffix('食狮.中国', '食狮.中国'); -checkPublicSuffix('www.食狮.中国', '食狮.中国'); -checkPublicSuffix('shishi.中国', 'shishi.中国'); -checkPublicSuffix('中国', null); -// Same as above, but punycoded. -checkPublicSuffix('xn--85x722f.com.cn', 'xn--85x722f.com.cn'); -checkPublicSuffix('xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn'); -checkPublicSuffix('www.xn--85x722f.xn--55qx5d.cn', 'xn--85x722f.xn--55qx5d.cn'); -checkPublicSuffix('shishi.xn--55qx5d.cn', 'shishi.xn--55qx5d.cn'); -checkPublicSuffix('xn--55qx5d.cn', null); -checkPublicSuffix('xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s'); -checkPublicSuffix('www.xn--85x722f.xn--fiqs8s', 'xn--85x722f.xn--fiqs8s'); -checkPublicSuffix('shishi.xn--fiqs8s', 'shishi.xn--fiqs8s'); -checkPublicSuffix('xn--fiqs8s', null); diff --git a/netwerk/test/unit/test_psl.js b/netwerk/test/unit/test_psl.js index 91124ea..446fe4c 100644 --- a/netwerk/test/unit/test_psl.js +++ b/netwerk/test/unit/test_psl.js @@ -1,9 +1,9 @@ +const Cc = Components.classes; +const Ci = Components.interfaces; + var etld = Cc["@mozilla.org/network/effective-tld-service;1"] .getService(Ci.nsIEffectiveTLDService); -var idna = Cc["@mozilla.org/network/idn-service;1"] - .getService(Ci.nsIIDNService); - function run_test() { var file = do_get_file("data/test_psl.txt"); @@ -13,7 +13,7 @@ function run_test() var scriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"] .getService(Ci.mozIJSSubScriptLoader); var srvScope = {}; - scriptLoader.loadSubScript(uri.spec, srvScope, "utf-8"); + scriptLoader.loadSubScript(uri.spec, srvScope); } function checkPublicSuffix(host, expectedSuffix) @@ -24,11 +24,5 @@ function checkPublicSuffix(host, expectedSuffix) } catch (e if e.name == "NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS" || e.name == "NS_ERROR_ILLEGAL_VALUE") { } - // The EffectiveTLDService always gives back punycoded labels. - // The test suite wants to get back what it put in. - if (actualSuffix !== null && expectedSuffix !== null && - /(^|\.)xn--/.test(actualSuffix) && !/(^|\.)xn--/.test(expectedSuffix)) { - actualSuffix = idna.convertACEtoUTF8(actualSuffix); - } do_check_eq(actualSuffix, expectedSuffix); }

1 0

[tor-browser/esr24] Bug 1033340 - Uplift recent PSL changes to Firefox 24. a=lsblakk.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b739985826f841f66243cb51d2e1d04d958e3de7 Author: Gervase Markham <gerv(a)gerv.net> Date: Thu Jul 3 09:51:36 2014 +0100 Bug 1033340 - Uplift recent PSL changes to Firefox 24. a=lsblakk. --- netwerk/dns/effective_tld_names.dat | 2435 ++++++++++++++++++++++++++++------- 1 file changed, 1972 insertions(+), 463 deletions(-) diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index ed1123b..c83fe0b 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -175,20 +175,21 @@ it.ao // aq : http://en.wikipedia.org/wiki/.aq aq -// ar : http://en.wikipedia.org/wiki/.ar -*.ar -!congresodelalengua3.ar -!educ.ar -!gobiernoelectronico.ar -!mecon.ar -!nacion.ar -!nic.ar -!promocion.ar -!retina.ar -!uba.ar +// 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(a)icann.org> 2008-06-18 +arpa e164.arpa in-addr.arpa ip6.arpa @@ -213,6 +214,7 @@ or.at // au : http://en.wikipedia.org/wiki/.au // http://www.auda.org.au/ +au // 2LDs com.au net.au @@ -243,10 +245,9 @@ sa.edu.au tas.edu.au vic.edu.au wa.edu.au -act.gov.au -// Removed at request of Shae.Donelan(a)services.nsw.gov.au, 2010-03-04 -// nsw.gov.au -nt.gov.au +// act.gov.au Bug 984824 - Removed at request of Greg Tankard +// nsw.gov.au Bug 547985 - Removed at request of <Shae.Donelan(a)services.nsw.gov.au> +// nt.gov.au Bug 940478 - Removed at request of Greg Connors <Greg.Connors(a)nt.gov.au> qld.gov.au sa.gov.au tas.gov.au @@ -291,6 +292,7 @@ rs.ba // bb : http://en.wikipedia.org/wiki/.bb bb biz.bb +co.bb com.bb edu.bb gov.bb @@ -298,6 +300,7 @@ info.bb net.bb org.bb store.bb +tv.bb // bd : http://en.wikipedia.org/wiki/.bd *.bd @@ -349,7 +352,7 @@ z.bg 6.bg 7.bg 8.bg -9.bg +9.bg // bh : http://en.wikipedia.org/wiki/.bh bh @@ -400,8 +403,8 @@ net.bo mil.bo tv.bo -// br : http://registro.br/dominio/dpn.html -// Updated by registry <fneves(a)registro.br> 2011-03-01 +// br : http://registro.br/dominio/categoria.html +// Submitted by registry <fneves(a)registro.br> 2014-03-04 br adm.br adv.br @@ -446,6 +449,7 @@ lel.br mat.br med.br mil.br +mp.br mus.br net.br nom.br @@ -491,6 +495,7 @@ org.bt // bv : No registrations at this time. // Submitted by registry <jarle(a)uninett.no> 2006-06-16 +bv // bw : http://en.wikipedia.org/wiki/.bw // http://www.gobin.info/domainname/bw.doc @@ -593,9 +598,12 @@ 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(a)cnnic.cn> 2008-06-11 @@ -787,7 +795,7 @@ org.ee fie.ee // eg : http://en.wikipedia.org/wiki/.eg -eg +eg com.eg edu.eg eun.eg @@ -810,7 +818,14 @@ gob.es edu.es // et : http://en.wikipedia.org/wiki/.et -*.et +et +com.et +gov.et +org.et +edu.et +biz.et +name.et +info.et // eu : http://en.wikipedia.org/wiki/.eu eu @@ -869,6 +884,7 @@ ga // gb : This registry is effectively dormant // Submitted by registry <Damien.Shaw(a)ja.net> 2008-06-12 +gb // gd : http://en.wikipedia.org/wiki/.gd gd @@ -886,13 +902,12 @@ pvt.ge // gf : http://en.wikipedia.org/wiki/.gf gf -// gg : http://www.channelisles.net/applic/avextn.shtml +// gg : http://www.channelisles.net/register-domains/ +// Confirmed by registry <nigel(a)channelisles.net> 2013-11-28 gg co.gg -org.gg net.gg -sch.gg -gov.gg +org.gg // gh : http://en.wikipedia.org/wiki/.gh // see also: http://www.nic.gh/reg_now.php @@ -923,6 +938,7 @@ gm // gn : http://psg.com/dns/gn/gn.txt // Submitted by registry <randy(a)psg.com> 2008-06-17 +gn ac.gn com.gn edu.gn @@ -1003,7 +1019,7 @@ org.hk 网絡.hk 组织.hk 組織.hk -組织.hk +組织.hk // hm : http://en.wikipedia.org/wiki/.hm hm @@ -1084,6 +1100,7 @@ id ac.id biz.id co.id +desa.id go.id mil.id my.id @@ -1099,16 +1116,18 @@ gov.ie // il : http://en.wikipedia.org/wiki/.il *.il -// im : https://www.nic.im/pdfs/imfaqs.pdf +// im : https://www.nic.im/ +// Submitted by registry <info(a)nic.im> 2013-11-15 im +ac.im co.im +com.im ltd.co.im -plc.co.im net.im -gov.im org.im -nic.im -ac.im +plc.co.im +tt.im +tv.im // in : http://en.wikipedia.org/wiki/.in // see also: http://www.inregistry.in/policies/ @@ -1180,294 +1199,385 @@ int.is it gov.it edu.it -// list of reserved geo-names : +// Reserved geo-names: // http://www.nic.it/documenti/regolamenti-e-linee-guida/regolamento-assegnazi… -// (There is also a list of reserved geo-names corresponding to Italian -// municipalities : http://www.nic.it/documenti/appendice-c.pdf , but it is -// not included here.) -agrigento.it +// There is also a list of reserved geo-names corresponding to Italian municipalities +// http://www.nic.it/documenti/appendice-c.pdf, but it is not included here. +// Regions +abr.it +abruzzo.it +aosta-valley.it +aostavalley.it +bas.it +basilicata.it +cal.it +calabria.it +cam.it +campania.it +emilia-romagna.it +emiliaromagna.it +emr.it +friuli-v-giulia.it +friuli-ve-giulia.it +friuli-vegiulia.it +friuli-venezia-giulia.it +friuli-veneziagiulia.it +friuli-vgiulia.it +friuliv-giulia.it +friulive-giulia.it +friulivegiulia.it +friulivenezia-giulia.it +friuliveneziagiulia.it +friulivgiulia.it +fvg.it +laz.it +lazio.it +lig.it +liguria.it +lom.it +lombardia.it +lombardy.it +lucania.it +mar.it +marche.it +mol.it +molise.it +piedmont.it +piemonte.it +pmn.it +pug.it +puglia.it +sar.it +sardegna.it +sardinia.it +sic.it +sicilia.it +sicily.it +taa.it +tos.it +toscana.it +trentino-a-adige.it +trentino-aadige.it +trentino-alto-adige.it +trentino-altoadige.it +trentino-s-tirol.it +trentino-stirol.it +trentino-sud-tirol.it +trentino-sudtirol.it +trentino-sued-tirol.it +trentino-suedtirol.it +trentinoa-adige.it +trentinoaadige.it +trentinoalto-adige.it +trentinoaltoadige.it +trentinos-tirol.it +trentinostirol.it +trentinosud-tirol.it +trentinosudtirol.it +trentinosued-tirol.it +trentinosuedtirol.it +tuscany.it +umb.it +umbria.it +val-d-aosta.it +val-daosta.it +vald-aosta.it +valdaosta.it +valle-aosta.it +valle-d-aosta.it +valle-daosta.it +valleaosta.it +valled-aosta.it +valledaosta.it +vallee-aoste.it +valleeaoste.it +vao.it +vda.it +ven.it +veneto.it +// Provinces ag.it -alessandria.it +agrigento.it al.it -ancona.it +alessandria.it +alto-adige.it +altoadige.it an.it +ancona.it +andria-barletta-trani.it +andria-trani-barletta.it +andriabarlettatrani.it +andriatranibarletta.it +ao.it aosta.it aoste.it -ao.it -arezzo.it +ap.it +aq.it +aquila.it ar.it +arezzo.it ascoli-piceno.it ascolipiceno.it -ap.it asti.it at.it -avellino.it av.it -bari.it +avellino.it ba.it -andria-barletta-trani.it -andriabarlettatrani.it -trani-barletta-andria.it -tranibarlettaandria.it +balsan.it +bari.it barletta-trani-andria.it barlettatraniandria.it -andria-trani-barletta.it -andriatranibarletta.it -trani-andria-barletta.it -traniandriabarletta.it -bt.it belluno.it -bl.it benevento.it -bn.it bergamo.it bg.it -biella.it bi.it -bologna.it +biella.it +bl.it +bn.it bo.it +bologna.it bolzano.it bozen.it -balsan.it -alto-adige.it -altoadige.it -suedtirol.it -bz.it +br.it brescia.it -bs.it brindisi.it -br.it -cagliari.it +bs.it +bt.it +bz.it ca.it +cagliari.it caltanissetta.it -cl.it +campidano-medio.it +campidanomedio.it campobasso.it -cb.it -carboniaiglesias.it carbonia-iglesias.it -iglesias-carbonia.it -iglesiascarbonia.it -ci.it +carboniaiglesias.it +carrara-massa.it +carraramassa.it caserta.it -ce.it catania.it -ct.it catanzaro.it -cz.it -chieti.it +cb.it +ce.it +cesena-forli.it +cesenaforli.it ch.it -como.it +chieti.it +ci.it +cl.it +cn.it co.it +como.it cosenza.it -cs.it -cremona.it cr.it +cremona.it crotone.it -kr.it +cs.it +ct.it cuneo.it -cn.it +cz.it dell-ogliastra.it dellogliastra.it -ogliastra.it -og.it -enna.it en.it -ferrara.it +enna.it +fc.it fe.it fermo.it -fm.it +ferrara.it +fg.it +fi.it firenze.it florence.it -fi.it +fm.it foggia.it -fg.it forli-cesena.it forlicesena.it -cesena-forli.it -cesenaforli.it -fc.it -frosinone.it fr.it -genova.it -genoa.it +frosinone.it ge.it -gorizia.it +genoa.it +genova.it go.it -grosseto.it +gorizia.it gr.it -imperia.it +grosseto.it +iglesias-carbonia.it +iglesiascarbonia.it im.it -isernia.it +imperia.it is.it -laquila.it -aquila.it -aq.it +isernia.it +kr.it la-spezia.it +laquila.it laspezia.it -sp.it latina.it -lt.it -lecce.it +lc.it le.it +lecce.it lecco.it -lc.it -livorno.it li.it -lodi.it +livorno.it lo.it -lucca.it +lodi.it +lt.it lu.it +lucca.it macerata.it -mc.it mantova.it -mn.it massa-carrara.it massacarrara.it -carrara-massa.it -carraramassa.it -ms.it matera.it -mt.it +mb.it +mc.it +me.it medio-campidano.it mediocampidano.it -campidano-medio.it -campidanomedio.it -vs.it messina.it -me.it -milano.it -milan.it mi.it -modena.it +milan.it +milano.it +mn.it mo.it -monza.it +modena.it monza-brianza.it +monza-e-della-brianza.it +monza.it monzabrianza.it monzaebrianza.it monzaedellabrianza.it -monza-e-della-brianza.it -mb.it -napoli.it -naples.it +ms.it +mt.it na.it -novara.it +naples.it +napoli.it no.it -nuoro.it +novara.it nu.it -oristano.it +nuoro.it +og.it +ogliastra.it +olbia-tempio.it +olbiatempio.it or.it +oristano.it +ot.it +pa.it padova.it padua.it -pd.it palermo.it -pa.it parma.it -pr.it pavia.it -pv.it -perugia.it -pg.it -pescara.it +pc.it +pd.it pe.it +perugia.it pesaro-urbino.it pesarourbino.it -urbino-pesaro.it -urbinopesaro.it -pu.it +pescara.it +pg.it +pi.it piacenza.it -pc.it pisa.it -pi.it pistoia.it -pt.it -pordenone.it pn.it +po.it +pordenone.it potenza.it -pz.it +pr.it prato.it -po.it +pt.it +pu.it +pv.it +pz.it +ra.it ragusa.it -rg.it ravenna.it -ra.it -reggio-calabria.it -reggiocalabria.it rc.it +re.it +reggio-calabria.it reggio-emilia.it +reggiocalabria.it reggioemilia.it -re.it -rieti.it +rg.it ri.it +rieti.it rimini.it +rm.it rn.it +ro.it roma.it rome.it -rm.it rovigo.it -ro.it -salerno.it sa.it +salerno.it sassari.it -ss.it savona.it -sv.it -siena.it si.it +siena.it siracusa.it -sr.it -sondrio.it so.it -taranto.it +sondrio.it +sp.it +sr.it +ss.it +suedtirol.it +sv.it ta.it +taranto.it +te.it tempio-olbia.it tempioolbia.it -olbia-tempio.it -olbiatempio.it -ot.it teramo.it -te.it terni.it -tr.it +tn.it +to.it torino.it -turin.it -to.it -trapani.it tp.it -trento.it +tr.it +trani-andria-barletta.it +trani-barletta-andria.it +traniandriabarletta.it +tranibarlettaandria.it +trapani.it trentino.it -tn.it +trento.it treviso.it -tv.it trieste.it ts.it -udine.it +turin.it +tv.it ud.it -varese.it +udine.it +urbino-pesaro.it +urbinopesaro.it va.it +varese.it +vb.it +vc.it +ve.it venezia.it venice.it -ve.it verbania.it -vb.it vercelli.it -vc.it verona.it -vr.it +vi.it vibo-valentia.it vibovalentia.it -vv.it vicenza.it -vi.it viterbo.it +vr.it +vs.it vt.it +vv.it -// je : http://www.channelisles.net/applic/avextn.shtml +// je : http://www.channelisles.net/register-domains/ +// Confirmed by registry <nigel(a)channelisles.net> 2013-11-28 je co.je -org.je net.je -sch.je -gov.je +org.je // jm : http://www.com.jm/register.html *.jm @@ -1488,7 +1598,7 @@ jobs // jp : http://en.wikipedia.org/wiki/.jp // http://jprs.co.jp/en/jpdomain.html -// Updated by registry <info(a)jprs.jp> 2012-05-28 +// Submitted by registry <info(a)jprs.jp> 2014-02-28 jp // jp organizational type names ac.jp @@ -1592,7 +1702,6 @@ konan.aichi.jp kota.aichi.jp mihama.aichi.jp miyoshi.aichi.jp -nagakute.aichi.jp nishio.aichi.jp nisshin.aichi.jp obu.aichi.jp @@ -2264,7 +2373,6 @@ rikuzentakata.iwate.jp shiwa.iwate.jp shizukuishi.iwate.jp sumita.iwate.jp -takizawa.iwate.jp tanohata.iwate.jp tono.iwate.jp yahaba.iwate.jp @@ -3302,6 +3410,7 @@ edu.kn gov.kn // kp : http://www.kcce.kp/en_index.php +kp com.kp edu.kp gov.kp @@ -3379,6 +3488,7 @@ org.la // lb : http://en.wikipedia.org/wiki/.lb // Submitted by registry <randy(a)psg.com> 2008-06-17 +lb com.lb edu.lb gov.lb @@ -3417,6 +3527,7 @@ hotel.lk // lr : http://psg.com/dns/lr/lr.txt // Submitted by registry <randy(a)psg.com> 2008-06-17 +lr com.lr edu.lr gov.lr @@ -3559,11 +3670,21 @@ mq mr gov.mr -// ms : http://en.wikipedia.org/wiki/.ms +// ms : http://www.nic.ms/pdf/MS_Domain_Name_Rules.pdf ms - -// mt : https://www.nic.org.mt/dotmt/ -*.mt +com.ms +edu.ms +gov.ms +net.ms +org.ms + +// mt : https://www.nic.org.mt/go/policy +// Submitted by registry <help(a)nic.org.mt> 2013-11-19 +mt +com.mt +edu.mt +net.mt +org.mt // mu : http://en.wikipedia.org/wiki/.mu mu @@ -4230,13 +4351,16 @@ other.nf store.nf // ng : http://psg.com/dns/ng/ -// Submitted by registry <randy(a)psg.com> 2008-06-17 -ac.ng +ng com.ng edu.ng -gov.ng +name.ng net.ng org.ng +sch.ng +gov.ng +mil.ng +mobi.ng // ni : http://www.nic.ni/dominios.htm *.ni @@ -4252,7 +4376,7 @@ bv.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: +// announce mailing list: // https://postlister.uninett.no/sympa/info/norid-diskusjon no // Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html @@ -5034,20 +5158,36 @@ com.nr nu // nz : http://en.wikipedia.org/wiki/.nz -*.nz +// Confirmed by registry <jay(a)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 -!mediaphone.om -!nawrastelecom.om -!nawras.om -!omanmobile.om -!omanpost.om -!omantel.om -!rakpetroleum.om -!siemens.om -!songfest.om -!statecouncil.om +om +co.om +com.om +edu.om +gov.om +med.om +museum.om +net.om +org.om +pro.om // org : http://en.wikipedia.org/wiki/.org org @@ -5502,7 +5642,6 @@ oryol.ru palana.ru penza.ru perm.ru -pskov.ru ptz.ru rnd.ru ryazan.ru @@ -5622,7 +5761,7 @@ gov.sd info.sd // se : http://en.wikipedia.org/wiki/.se -// Submitted by registry <Patrik.Wallstrom(a)iis.se> 2008-06-24 +// Submitted by registry <patrik.wallstrom(a)iis.se> 2014-03-18 se a.se ac.se @@ -5656,7 +5795,6 @@ pp.se press.se r.se s.se -sshn.se t.se tm.se u.se @@ -5687,6 +5825,7 @@ si // sj : No registrations at this time. // Submitted by registry <jarle(a)uninett.no> 2008-06-16 +sj // sk : http://en.wikipedia.org/wiki/.sk // list of 2nd level domains ? @@ -5741,8 +5880,13 @@ store.st // su : http://en.wikipedia.org/wiki/.su su -// sv : http://www.svnet.org.sv/svpolicy.html -*.sv +// sv : http://www.svnet.org.sv/niveldos.pdf +sv +com.sv +edu.sv +gob.sv +org.sv +red.sv // sx : http://en.wikipedia.org/wiki/.sx // Confirmed by registry <jcvignes(a)openregistry.com> 2012-05-31 @@ -5864,6 +6008,10 @@ org.to edu.to mil.to +// tp : No registrations at this time. +// Submitted by Ryan Sleevi <ryan.sleevi(a)gmail.com> 2014-01-03 +tp + // tr : http://en.wikipedia.org/wiki/.tr *.tr !nic.tr @@ -5917,6 +6065,7 @@ club.tw // tz : http://www.tznic.or.tz/index.php/domains // Confirmed by registry <manager(a)tznic.or.tz> 2013-01-22 +tz ac.tz co.tz go.tz @@ -6029,19 +6178,19 @@ com.ug org.ug // uk : http://en.wikipedia.org/wiki/.uk -// Submitted by registry <noc(a)nominet.org.uk> 2012-10-02 -// and tweaked by us pending further consultation. -*.uk +// Submitted by registry <Michael.Daly(a)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 @@ -6125,7 +6274,7 @@ k12.de.us k12.fl.us k12.ga.us k12.gu.us -// k12.hi.us Hawaii has a state-wide DOE login: bug 614565 +// k12.hi.us Bug 614565 - Hawaii has a state-wide DOE login k12.ia.us k12.id.us k12.il.us @@ -6156,7 +6305,7 @@ k12.pa.us k12.pr.us k12.ri.us k12.sc.us -k12.sd.us +// k12.sd.us Bug 934131 - Removed at request of James Booze <James.Booze(a)k12.sd.us> k12.tn.us k12.tx.us k12.ut.us @@ -6165,7 +6314,7 @@ k12.vt.us k12.va.us k12.wa.us k12.wi.us -k12.wv.us +// k12.wv.us Bug 947705 - Removed at request of Verne Britton <verne(a)wvnet.edu> k12.wy.us cc.ak.us @@ -6277,316 +6426,1610 @@ lib.vt.us lib.va.us lib.wa.us lib.wi.us -lib.wv.us +// lib.wv.us Bug 941670 - Removed at request of Larry W Arnold <arnold(a)wvlc.lib.wv.us> lib.wy.us -// k12.ma.us contains school districts in Massachusetts. The 4LDs are -// managed indepedently except for private (PVT), charter (CHTR) and -// parochial (PAROCH) schools. Those are delegated dorectly to the -// 5LD operators. <k12-ma-hostmaster _ at _ rsuc.gweep.net> -pvt.k12.ma.us -chtr.k12.ma.us -paroch.k12.ma.us +// k12.ma.us contains school districts in Massachusetts. The 4LDs are +// managed indepedently except for private (PVT), charter (CHTR) and +// parochial (PAROCH) schools. Those are delegated dorectly to the +// 5LD operators. <k12-ma-hostmaster _ at _ rsuc.gweep.net> +pvt.k12.ma.us +chtr.k12.ma.us +paroch.k12.ma.us + +// uy : http://www.nic.org.uy/ +uy +com.uy +edu.uy +gub.uy +mil.uy +net.uy +org.uy + +// uz : http://www.reg.uz/ +uz +co.uz +com.uz +net.uz +org.uz + +// va : http://en.wikipedia.org/wiki/.va +va + +// vc : http://en.wikipedia.org/wiki/.vc +// Submitted by registry <kshah(a)ca.afilias.info> 2008-06-13 +vc +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 +// are available for registration (which they do not seem to be). +vi +co.vi +com.vi +k12.vi +net.vi +org.vi + +// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp +vn +com.vn +net.vn +org.vn +edu.vn +gov.vn +int.vn +ac.vn +biz.vn +info.vn +name.vn +pro.vn +health.vn + +// vu : http://en.wikipedia.org/wiki/.vu +// 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 +net.ws +org.ws +gov.ws +edu.ws + +// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf +yt + +// IDN ccTLDs +// Please sort by ISO 3166 ccTLD, then punicode string +// when submitting patches and follow this format: +// <Punicode> ("<english word>" <language>) : <ISO 3166 ccTLD> +// [optional sponsoring org] +// <URL> + +// xn--mgbaam7a8h ("Emerat" Arabic) : AE +// http://nic.ae/english/arabicdomain/rules.jsp +امارات + +// xn--54b7fta0cc ("Bangla" Bangla) : BD +বাংলা + +// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhongguo>) : CN +// CNNIC +// http://cnnic.cn/html/Dir/2005/10/11/3218.htm +中国 + +// xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhongguo>) : CN +// CNNIC +// http://cnnic.cn/html/Dir/2005/10/11/3218.htm +中國 + +// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ +الجزائر + +// xn--wgbh1c ("Egypt" Arabic .masr) : EG +// http://www.dotmasr.eg/ +مصر + +// xn--node ("ge" Georgian (Mkhedruli)) : GE +გე + +// xn--j6w193g ("Hong Kong" Chinese-Han) : HK +// https://www2.hkirc.hk/register/rules.jsp +香港 + +// xn--h2brj9c ("Bharat" Devanagari) : IN +// India +भारत + +// xn--mgbbh1a71e ("Bharat" Arabic) : IN +// India +بھارت + +// xn--fpcrj9c3d ("Bharat" Telugu) : IN +// India +భారత్ + +// xn--gecrj9c ("Bharat" Gujarati) : IN +// India +ભારત + +// xn--s9brj9c ("Bharat" Gurmukhi) : IN +// India +ਭਾਰਤ + +// xn--45brj9c ("Bharat" Bengali) : IN +// India +ভারত + +// xn--xkc2dl3a5ee0h ("India" Tamil) : IN +// India +இந்தியா + +// xn--mgba3a4f16a ("Iran" Persian) : IR +ایران + +// xn--mgba3a4fra ("Iran" Arabic) : IR +ايران + +// xn--mgbayh7gpa ("al-Ordon" Arabic) : JO +// National Information Technology Center (NITC) +// Royal Scientific Society, Al-Jubeiha +الاردن + +// xn--3e0b707e ("Republic of Korea" Hangul) : KR +한국 + +// xn--80ao21a ("Kaz" Kazakh) : KZ +қаз + +// xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK +// http://nic.lk +ලංකා + +// xn--xkc2al3hye2a ("Ilangai" Tamil) : LK +// http://nic.lk +இலங்கை + +// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA +المغرب + +// xn--l1acc ("mon" Mongolian) : MN +мон + +// xn--mgbx4cd0ab ("Malaysia" Malay) : MY +مليسيا + +// xn--mgb9awbf ("Oman" Arabic) : OM +عمان + +// 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/ +قطر + +// xn--mgberp4a5d4ar ("AlSaudiah" Arabic) : SA +// http://www.nic.net.sa/ +السعودية + +// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA +السعودیة + +// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA +السعودیۃ + +// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA +السعوديه + +// xn--ogbpf8fl ("Syria" Arabic) : SY +سورية + +// xn--mgbtf8fl ("Syria" Arabic) variant : SY +سوريا + +// xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG +新加坡 + +// xn--clchc0ea0b2g2a9gcd ("Singapore" Tamil) : SG +சிங்கப்பூர் + +// xn--o3cw4h ("Thai" Thai) : TH +// http://www.thnic.co.th +ไทย + +// xn--pgbs0dh ("Tunis") : TN +// http://nic.tn +تونس + +// xn--kpry57d ("Taiwan" Chinese-Han-Traditional) : TW +// http://www.twnic.net/english/dn/dn_07a.htm +台灣 + +// xn--kprw13d ("Taiwan" Chinese-Han-Simplified) : TW +// http://www.twnic.net/english/dn/dn_07a.htm +台湾 + +// xn--nnx388a ("Taiwan") variant : TW +臺灣 + +// xn--j1amh ("ukr" Cyrillic) : UA +укр + +// xn--mgb2ddes ("AlYemen" Arabic) : YE +اليمن + +// xxx : http://icmregistry.com +xxx + +// ye : http://www.y.net.ye/services/domain_name.htm +*.ye + +// za : http://www.zadna.org.za/slds.html +*.za + +// zm : http://en.wikipedia.org/wiki/.zm +*.zm + +// zw : http://en.wikipedia.org/wiki/.zw +*.zw + + +// xn--80asehdb : 2013-07-14 CORE Association +онлайн + +// xn--80aswg : 2013-07-14 CORE Association +сайт + +// xn--ngbc5azd : 2013-07-14 International Domain Registry Pty. Ltd. +شبكة + +// xn--unup4y : 2013-07-14 Spring Fields, LLC +游戏 + +// xn--vhquv : 2013-08-28 Dash McCook, LLC +企业 + +// camera : 2013-08-28 Atomic Maple, LLC +camera + +// clothing : 2013-08-28 Steel Lake, LLC +clothing + +// lighting : 2013-08-28 John McCook, LLC +lighting + +// singles : 2013-08-28 Fern Madison, LLC +singles + +// ventures : 2013-08-28 Binky Lake, LLC +ventures + +// voyage : 2013-08-28 Ruby House, LLC +voyage + +// guru : 2013-08-28 Pioneer Cypress, LLC +guru + +// holdings : 2013-08-28 John Madison, LLC +holdings + +// equipment : 2013-08-28 Corn Station, LLC +equipment + +// bike : 2013-08-28 Grand Hollow, LLC +bike + +// estate : 2013-08-28 Trixy Park, LLC +estate + +// tattoo : 2013-08-30 Uniregistry,Corp. +tattoo + +// xn--3ds443g : 2013-09-09 TLD Registry Limited +在线 + +// xn--fiq228c5hs : 2013-09-09 TLD Registry Limited +中文网 + +// land : 2013-09-10 Pine Moon, LLC +land + +// plumbing : 2013-09-10 Spring Tigers, LLC +plumbing + +// contractors : 2013-09-10 Magic Woods, LLC +contractors + +// sexy : 2013-09-11 Uniregistry,Corp. +sexy + +// menu : 2013-09-11 Wedding TLD2, LLC +menu + +// xn--rhqv96g : 2013-09-11 Stable Tone Limited +世界 + +// uno : 2013-09-11 Dot Latin, LLC +uno + +// gallery : 2013-09-13 Sugar House, LLC +gallery + +// technology : 2013-09-13 Auburn Falls +technology + +// xn--3bst00m : 2013-09-13 Eagle Horizon Limited +集团 + +// reviews : 2013-09-13 Extra Cover, LLC +reviews + +// guide : 2013-09-13 Snow Moon, LLC +guide + +// xn--6qq986b3x1 : 2013-09-13 Tycoon Treasure Limited +我爱你 + +// graphics : 2013-09-13 Over Madison, LLC +graphics + +// construction : 2013-09-13 Fox Dynamite, LLC +construction + +// onl : 2013-09-16 I-Registry Ltd. +onl + +// xn--q9jyb4c : 2013-09-17 Charleston Road Registry +みんな + +// diamonds : 2013-09-23 John Edge, LLC +diamonds + +// kiwi : 2013-09-23 Dot Kiwi Limited +kiwi + +// enterprises : 2013-09-23 Snow Oaks LLC +enterprises + +// today : 2013-09-23 Pearl Woods, LLC +today + +// futbol : 2013-09-23 Atomic Falls, LLC +futbol + +// photography : 2013-09-23 Sugar Glen, LLC +photography + +// tips : 2013-09-23 Corn Willow, LLC +tips + +// directory : 2013-09-23 Extra Madison, LLC +directory + +// kitchen : 2013-09-23 Just Goodbye, LLC +kitchen + +// xn--6frz82g : 2013-09-24 Afilias Limited +移动 + +// kim : 2013-09-24 Afilias Limited +kim + +// xn--cg4bki : 2013-09-27 Samsung SDS Co., LTD +삼성 + +// monash : 2013-10-01 Monash University +monash + +// wed : 2013-10-02 Atgron, Inc. +wed + +// pink : 2013-10-02 Afilias Limited +pink + +// ruhr : 2013-10-02 regiodot GmbH & Co. KG +ruhr + +// buzz : 2013-10-03 DOTSTRATEGY CO. +buzz + +// careers : 2013-10-03 Wild Corner, LLC +careers + +// shoes : 2013-10-03 Binky Galley, LLC +shoes + +// xn--4gbrim : 2013-10-07 Suhub Electronic Establishment +موقع + +// career : 2013-10-09 dotCareer, LLC +career + +// otsuka : 2013-10-11 Otsuka Holdings Co. Ltd. +otsuka + +// xn--fiQ64b : 2013-10-14 CITIC Group Corporation +中信 + +// gift : 2013-10-18 Uniregistry Corp. +gift + +// recipes : 2013-10-18 Grand Island, LLC +recipes + +// coffee : 2013-10-18 Trixy Cover, LLC +coffee + +// luxury : 2013-10-18 Luxury Partners, LLC +luxury + +// domains : 2013-10-18 Sugar Cross, LLC +domains + +// photos : 2013-10-18 Sea Corner, LLC +photos + +// limo : 2013-10-18 Hidden Frostbite, LLC +limo + +// viajes : 2013-10-18 Black Madison, LLC +viajes + +// wang : 2013-10-24 Zodiac Leo Limited +wang + +// democrat : 2013-10-24 United TLD Holdco Ltd. +democrat + +// mango : 2013-10-25 PUNTO FA S.L. +mango + +// cab : 2013-10-25 Half Sunset, LLC +cab + +// support : 2013-10-25 Grand Orchard, LLC +support + +// dance : 2013-10-25 United TLD Holdco Ltd. +dance + +// nagoya : 2013-10-25 GMO Registry, Inc. +nagoya + +// computer : 2013-10-25 Pine Mill, LLC +computer + +// wien : 2013-10-28 punkt.wien GmbH +wien + +// berlin : 2013-10-31 dotBERLIN GmbH & Co. KG +berlin + +// codes : 2013-10-31 Puff Willow, LLC +codes + +// email : 2013-10-31 Spring Madison, LLC +email + +// xn--mgbab2bd : 2013-10-31 CORE Association +بازار + +// repair : 2013-11-07 Lone Sunset, LLC +repair + +// holiday : 2013-11-07 Goose Woods, LLC +holiday + +// center : 2013-11-07 Tin Mill, LLC +center + +// systems : 2013-11-07 Dash Cypress, LLC +systems + +// wiki : 2013-11-07 Top Level Design, LLC +wiki + +// ceo : 2013-11-07 CEOTLD Pty Ltd +ceo + +// international : 2013-11-07 Wild Way, LLC +international + +// solar : 2013-11-07 Ruby Town, LLC +solar + +// company : 2013-11-07 Silver Avenue, LLC +company + +// education : 2013-11-07 Brice Way, LLC +education + +// training : 2013-11-07 Wild Willow, LLC +training + +// academy : 2013-11-07 Half Oaks, LLC +academy + +// marketing : 2013-11-07 Fern Pass, LLC +marketing + +// florist : 2013-11-08 Half Cypress, LLC +florist + +// solutions : 2013-11-07 Silver Cover, LLC +solutions + +// build : 2013-11-07 Plan Bee LLC +build + +// institute : 2013-11-07 Outer Maple, LLC +institute + +// builders : 2013-11-07 Atomic Madison, LLC +builders + +// red : 2013-11-07 Afilias Limited +red + +// blue : 2013-11-07 Afilias Limited +blue + +// ninja : 2013-11-07 United TLD Holdco Ltd. +ninja + +// business : 2013-11-07 Spring Cross, LLC +business + +// gal : 2013-11-07 Asociación puntoGAL +gal + +// social : 2013-11-07 United TLD Holdco Ltd. +social + +// house : 2013-11-07 Sugar Park, LLC +house + +// camp : 2013-11-07 Delta Dynamite, LLC +camp + +// immobilien : 2013-11-07 United TLD Holdco Ltd. +immobilien + +// moda : 2013-11-07 United TLD Holdco Ltd. +moda + +// glass : 2013-11-07 Black Cover, LLC +glass + +// management : 2013-11-07 John Goodbye, LLC +management + +// kaufen : 2013-11-07 United TLD Holdco Ltd. +kaufen + +// farm : 2013-11-07 Just Maple, LLC +farm + +// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center +公益 + +// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center +政务 + +// club : 2013-11-08 .CLUB DOMAINS, LLC +club + +// voting : 2013-11-13 Valuetainment Corp. +voting + +// TOKYO : 2013-11-13 GMO Registry, Inc. +tokyo + +// moe : 2013-11-13 Interlink Co., Ltd. +moe + +// guitars : 2013-11-14 Uniregistry, Corp. +guitars + +// bargains : 2013-11-14 Half Hallow, LLC +bargains + +// xn--nqv7fs00ema : 2013-11-14 Public Interest Registry +组织机构 + +// desi : 2013-11-14 Desi Networks LLC +desi + +// cool : 2013-11-14 Koko Lake, LLC +cool + +// boutique : 2013-11-14 Over Galley, LLC +boutique + +// pics : 2013-11-14 Uniregistry, Corp. +pics + +// xn--c1avg : 2013-11-14 Public Interest Registry +орг + +// xn--55qx5d : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） +公司 + +// xn--io0a7i : 2013-11-14 Computer Network Information Center of Chinese Academy of Sciences （China Internet Network Information Center） +网络 + +// cheap : 2013-11-14 Sand Cover, LLC +cheap + +// xn--xhq521b : 2013-11-14 Guangzhou YU Wei Information Technology Co., Ltd. +广东 + +// photo : 2013-11-14 Uniregistry, Corp. +photo + +// network : 2013-11-14 Trixy Manor, LLC +network + +// zone : 2013-11-14 Outer Falls, LLC +zone + +// xn--nqv7f : 2013-11-14 Public Interest Registry +机构 + +// link : 2013-11-14 Uniregistry, Corp. +link + +// QPON : 2013-11-14 dotCOOL, Inc. +qpon + +// xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry +संगठन + +// agency : 2013-11-14 Steel Falls, LLC +agency + +// tienda : 2013-11-14 Victor Manor, LLC +tienda + +// works : 2013-11-14 Little Dynamite, LLC +works + +// london : 2013-11-14 Dot London Domains Limited +london + +// watch : 2013-11-14 Sand Shadow, LLC +watch + +// rocks : 2013-11-14 Ruby Moon, LLC +rocks + +// SHIKSHA : 2013-11-14 Afilias Limited +shiksha + +// xn--d1acj3b : 2013-11-21 The Foundation for Network Initiatives “The Smart Internet” +дети + +// budapest : 2013-11-21 Top Level Domain Holdings Limited +budapest + +// nrw : 2013-11-21 Minds + Machines GmbH +nrw + +// VOTE : 2013-11-21 Monolith Registry LLC +vote + +// fishing : 2013-11-21 Top Level Domain Holdings Limited +fishing + +// expert : 2013-11-21 Magic Pass, LLC +expert + +// horse : 2013-11-21 Top Level Domain Holdings Limited +horse + +// christmas : 2013-11-21 Uniregistry, Corp. +christmas + +// cooking : 2013-11-21 Top Level Domain Holdings Limited +cooking + +// xn--czru2d : 2013-11-21 Zodiac Capricorn Limited +商城 + +// casa : 2013-11-21 Top Level Domain Holdings Limited +casa + +// rich : 2013-11-21 I-REGISTRY Ltd., Niederlassung Deutschland +rich + +// VOTO : 2013-11-21 Monolith Registry LLC +voto + +// tools : 2013-11-21 Pioneer North, LLC +tools + +// xn--45q11c : 2013-11-21 Zodiac Scorpio Limited +八卦 + +// praxi : 2013-12-05 Praxi S.p.A. +praxi + +// events : 2013-12-05 Pioneer Maple, LLC +events + +// flights : 2013-12-05 Fox Station, LLC +flights + +// report : 2013-12-05 Binky Glen, LLC +report + +// partners : 2013-12-05 Magic Glen, LLC +partners + +// neustar : 2013-12-05 NeuStar, Inc. +neustar + +// rentals : 2013-12-05 Big Hollow,LLC +rentals + +// catering : 2013-12-05 New Falls. LLC +catering + +// community : 2013-12-05 Fox Orchard, LLC +community + +// maison : 2013-12-05 Victor Frostbite, LLC +maison + +// parts : 2013-12-05 Sea Goodbye, LLC +parts + +// cleaning : 2013-12-05 Fox Shadow, LLC +cleaning + +// okinawa : 2013-12-05 BusinessRalliart inc. +okinawa + +// foundation : 2013-12-05 John Dale, LLC +foundation + +// properties : 2013-12-05 Big Pass, LLC +properties + +// vacations : 2013-12-05 Atomic Tigers, LLC +vacations + +// productions : 2013-12-05 Magic Birch, LLC +productions + +// industries : 2013-12-05 Outer House, LLC +industries + +// haus : 2013-12-05 Pixie Edge, LLC +haus + +// vision : 2013-12-05 Koko Station, LLC +vision + +// mormon : 2013-12-05 IRI Domain Management, LLC (""Applicant"") +mormon + +// cards : 2013-12-05 Foggy Hollow, LLC +cards + +// ink : 2013-12-05 Top Level Design, LLC +ink + +// villas : 2013-12-05 New Sky, LLC +villas + +// consulting : 2013-12-05 Pixie Station, LLC +consulting + +// cruises : 2013-12-05 Spring Way, LLC +cruises + +// krd : 2013-12-05 KRG Department of Information Technology +krd + +// xyz : 2013-12-05 XYZ.COM LLC +xyz + +// dating : 2013-12-05 Pine Fest, LLC +dating + +// exposed : 2013-12-05 Victor Beach, LLC +exposed + +// condos : 2013-12-05 Pine House, LLC +condos + +// eus : 2013-12-12 Puntueus Fundazioa +eus + +// Caravan : 2013-12-12 Caravan International, Inc. +caravan + +// actor : 2013-12-12 United TLD Holdco Ltd. +actor + +// saarland : 2013-12-12 dotSaarland GmbH +saarland + +// yokohama : 2013-12-12 GMO Registry, Inc. +yokohama + +// pub : 2013-12-12 United TLD Holdco Ltd. +pub + +// xn--p1acf : 2013-12-12 Rusnames Limited +рус + +// ren : 2013-12-12 Beijing Qianxiang Wangjing Technology Development Co., Ltd. +ren + +// fish : 2013-12-12 Fox Woods, LLC +fish + +// BAR : 2013-12-12 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable +bar + +// DNP : 2013-12-13 Dai Nippon Printing Co., Ltd. +dnp + +// bid : 2013-12-19 dot Bid Limited +bid + +// supply : 2013-12-19 Half Falls, LLC +supply + +// Miami : 2013-12-19 Top Level Domain Holdings Limited +miami + +// supplies : 2013-12-19 Atomic Fields, LLC +supplies + +// quebec : 2013-12-19 PointQuébec Inc +quebec + +// MOSCOW : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) +moscow + +// globo : 2013-12-19 Globo Comunicação e Participações S.A +globo + +// AXA : 2013-12-19 AXA SA +axa + +// xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID) +москва + +// xn--czrs0t : 2013-12-19 Wild Island, LLC +商店 + +// vodka : 2013-12-19 Top Level Domain Holdings Limited +vodka + +// REST : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable +rest + +// frogans : 2013-12-19 OP3FT +frogans + +// WTC : 2013-12-19 World Trade Centers Association, Inc. +wtc + +// rodeo : 2013-12-19 Top Level Domain Holdings Limited +rodeo + +// sohu : 2013-12-19 Sohu.com Limited +sohu + +// BEST : 2013-12-19 BestTLD Pty Ltd +best + +// country : 2013-12-19 Top Level Domain Holdings Limited +country + +// KRED : 2013-12-19 KredTLD Pty Ltd +kred + +// feedback : 2013-12-19 Top Level Spectrum, Inc. +feedback + +// work : 2013-12-19 Top Level Domain Holdings Limited +work + +// luxe : 2014-01-09 Top Level Domain Holdings Limited +luxe + +// ryukyu : 2014-01-09 BusinessRalliart inc. +ryukyu + +// autos : 2014-01-09 DERAutos, LLC +autos + +// homes : 2014-01-09 DERHomes, LLC +homes + +// jetzt : 2014-01-09 New TLD Company AB +jetzt + +// yachts : 2014-01-09 DERYachts, LLC +yachts + +// motorcycles : 2014-01-09 DERMotorcycles, LLC +motorcycles + +// mini : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft +mini + +// ggee : 2014-01-09 GMO Internet, Inc. +ggee + +// beer : 2014-01-09 Top Level Domain Holdings Limited +beer + +// xn--1qqw23a : 2014-01-13 Guangzhou YU Wei Information Technology Co., Ltd. +佛山 + +// college : 2014-01-16 XYZ.COM LLC +college + +// ovh : 2014-01-16 OVH SAS +ovh + +// meet : 2014-01-16 Afilias Limited +meet + +// xn--ses554g : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES (HOLDING) COMPANY. HONGKONG LIMITED +网址 + +// gop : 2014-01-16 Republican State Leadership Committee, Inc. +gop + +// blackfriday : 2014-01-16 Uniregistry, Corp. +blackfriday + +// lacaixa : 2014-01-16 CAIXA D'ESTALVIS I PENSIONS DE BARCELONA +lacaixa + +// xn--czr694b : 2014-01-16 HU YI GLOBAL INFORMATION RESOURCES(HOLDING) COMPANY.HONGKONG LIMITED +商标 + +// vegas : 2014-01-16 Dot Vegas, Inc. +vegas + +// black : 2014-01-16 Afilias Limited +black + +// soy : 2014-01-23 Charleston Road Registry Inc. +soy + +// trade : 2014-01-23 Elite Registry Limited +trade + +// gent : 2014-01-23 COMBELL GROUP NV/SA +gent + +// ing : 2014-01-23 Charleston Road Registry Inc. +ing + +// dad : 2014-01-23 Charleston Road Registry Inc. +dad + +// shriram : 2014-01-23 Shriram Capital Ltd. +shriram + +// bayern : 2014-01-23 Bayern Connect GmbH +bayern + +// scot : 2014-01-23 Dot Scot Registry Limited +scot + +// webcam : 2014-01-23 dot Webcam Limited +webcam + +// foo : 2014-01-23 Charleston Road Registry Inc. +foo + +// eat : 2014-01-23 Charleston Road Registry Inc. +eat + +// nyc : 2014-01-23 The City of New York +nyc + +// prod : 2014-01-23 Charleston Road Registry Inc. +prod + +// how : 2014-01-23 Charleston Road Registry Inc. +how + +// day : 2014-01-30 Charleston Road Registry Inc. +day + +// meme : 2014-01-30 Charleston Road Registry Inc. +meme + +// mov : 2014-01-30 Charleston Road Registry Inc. +mov + +// paris : 2014-01-30 City of Paris +paris + +// boo : 2014-01-30 Charleston Road Registry Inc. +boo + +// new : 2014-01-30 Charleston Road Registry Inc. +new + +// ifm : 2014-01-30 ifm electronic gmbh +ifm + +// life : 2014-02-06 Trixy Oaks, LLC +life + +// archi : 2014-02-06 STARTING DOT LIMITED +archi + +// spiegel : 2014-02-06 SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG +spiegel + +// brussels : 2014-02-06 DNS.be vzw +brussels + +// church : 2014-02-06 Holly Fileds, LLC +church + +// here : 2014-02-06 Charleston Road Registry Inc. +here + +// dabur : 2014-02-06 Dabur India Limited +dabur + +// vlaanderen : 2014-02-06 DNS.be vzw +vlaanderen + +// cologne : 2014-02-06 NetCologne Gesellschaft für Telekommunikation mbH +cologne + +// xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd +手机 + +// wme : 2014-02-13 William Morris Endeavor Entertainment, LLC +wme + +// nhk : 2014-02-13 Japan Broadcasting Corporation (NHK) +nhk + +// suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION +suzuki + +// whoswho : 2014-02-20 Who's Who Registry +whoswho + +// scb : 2014-02-20 The Siam Commercial Bank Public Company Limited ("SCB""\) +scb + +// hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH +hamburg + +// services : 2014-02-27 Fox Castle, LLC +services + +// bzh : 2014-02-27 Association www.bzh +bzh + +// rio : 2014-02-27 Empresa Municipal de Informática SA - IPLANRIO +rio + +// cash : 2014-03-07 Delta Lake, LLC +cash + +// gives : 2014-03-07 United TLD Holdco Ltd. +gives + +// hiphop : 2014-03-07 Uniregistry, Corp. +hiphop + +// degree : 2014-03-07 Puff House, LLC +degree + +// digital : 2014-03-07 Dash Park, LLC +digital + +// rehab : 2014-03-07 United TLD Holdco Ltd. +rehab + +// wtf : 2014-03-07 Hidden Way, LLC +wtf + +// financial : 2014-03-07 Just Cover, LLC +financial + +// limited : 2014-03-07 Big Fest, LLC +limited + +// discount : 2014-03-07 Holly Hill, LLC +discount + +// fail : 2014-03-07 Atomic Pipe, LLC +fail + +// vet : 2014-03-07 Wild Dale, LLC +vet + +// ngo : 2014-03-07 Public Interest Registry +ngo + +// fitness : 2014-03-07 Brice Orchard, LLC +fitness + +// schule : 2014-03-07 Outer Moon, LLC +schule + +// navy : 2014-03-07 United TLD Holdco Ltd. +navy + +// bio : 2014-03-07 STARTING DOT LIMITED +bio + +// ong : 2014-03-07 Public Interest Registry +ong + +// town : 2014-03-07 Koko Moon, LLC +town + +// toys : 2014-03-07 Pioneer Orchard, LLC +toys + +// army : 2014-03-07 United TLD Holdco Ltd. +army + +// engineering : 2014-03-07 Romeo Canyon +engineering + +// capital : 2014-03-07 Delta Mill, LLC +capital + +// exchange : 2014-03-07 Spring Falls, LLC +exchange + +// fan : 2014-03-07 Goose Glen, LLC +fan + +// market : 2014-03-07 Victor Way, LLC +market + +// media : 2014-03-07 Grand Glen, LLC +media + +// lease : 2014-03-07 Victor Trail, LLC +lease + +// university : 2014-03-07 Little Station, LLC +university + +// reisen : 2014-03-07 New Cypress, LLC +reisen + +// airforce : 2014-03-07 United TLD Holdco Ltd. +airforce + +// pictures : 2014-03-07 Foggy Sky, LLC +pictures + +// gripe : 2014-03-07 Corn Sunset, LLC +gripe -// uy : http://www.nic.org.uy/ -uy -com.uy -edu.uy -gub.uy -mil.uy -net.uy -org.uy +// engineering : 2014-03-07 United TLD Holdco Ltd. +engineering -// uz : http://www.reg.uz/ -uz -co.uz -com.uz -net.uz -org.uz +// associates : 2014-03-07 Baxter Hill, LLC +associates -// va : http://en.wikipedia.org/wiki/.va -va +// xn--mxtq1m : 2014-03-07 Net-Chinese Co., Ltd. +政府 -// vc : http://en.wikipedia.org/wiki/.vc -// Submitted by registry <kshah(a)ca.afilias.info> 2008-06-13 -vc -com.vc -net.vc -org.vc -gov.vc -mil.vc -edu.vc +// williamhill : 2014-03-13 William Hill Organization Limited +williamhill -// ve : https://registro.nic.ve/ -// Confirmed by registry 2012-10-04 -ve -co.ve -com.ve -e12.ve -edu.ve -gov.ve -info.ve -mil.ve -net.ve -org.ve -web.ve +// hiv : 2014-03-13 dotHIV gemeinnuetziger e.V. +hiv -// vg : http://en.wikipedia.org/wiki/.vg -vg +// sca : 2014-03-13 SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ) +sca -// 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 -// are available for registration (which they do not seem to be). -vi -co.vi -com.vi -k12.vi -net.vi -org.vi +// reise : 2014-03-13 dotreise GmbH +reise -// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp -vn -com.vn -net.vn -org.vn -edu.vn -gov.vn -int.vn -ac.vn -biz.vn -info.vn -name.vn -pro.vn -health.vn +// accountants : 2014-03-20 Knob Town, LLC +accountants -// vu : http://en.wikipedia.org/wiki/.vu -// list of 2nd level tlds ? -vu +// clinic : 2014-03-20 Goose Park, LLC +clinic -// wf : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf -wf +// versicherung : 2014-03-20 dotversicherung-registry GmbH +versicherung -// ws : http://en.wikipedia.org/wiki/.ws -// http://samoanic.ws/index.dhtml -ws -com.ws -net.ws -org.ws -gov.ws -edu.ws +// top : 2014-03-20 Jiangsu Bangning Science & Technology Co.,Ltd. +top -// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf -yt +// furniture : 2014-03-20 Lone Fields, LLC +furniture -// IDN ccTLDs -// Please sort by ISO 3166 ccTLD, then punicode string -// when submitting patches and follow this format: -// <Punicode> ("<english word>" <language>) : <ISO 3166 ccTLD> -// [optional sponsoring org] -// <URL> +// dental : 2014-03-20 Tin Birch, LLC +dental -// xn--mgbaam7a8h ("Emerat" Arabic) : AE -// http://nic.ae/english/arabicdomain/rules.jsp -امارات +// fund : 2014-03-20 John Castle, LLC +fund -// xn--54b7fta0cc ("Bangla" Bangla) : BD -বাংলা +// creditcard : 2014-03-20 Binky Frostbite, LLC +creditcard -// xn--fiqs8s ("China" Chinese-Han-Simplified <.Zhonggou>) : CN -// CNNIC -// http://cnnic.cn/html/Dir/2005/10/11/3218.htm -中国 +// insure : 2014-03-20 Pioneer Willow, LLC +insure -// xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhonggou>) : CN -// CNNIC -// http://cnnic.cn/html/Dir/2005/10/11/3218.htm -中國 +// audio : 2014-03-20 Uniregistry, Corp. +audio -// xn--lgbbat1ad8j ("Algeria / Al Jazair" Arabic) : DZ -الجزائر +// claims : 2014-03-20 Black Corner, LLC +claims -// xn--wgbh1c ("Egypt" Arabic .masr) : EG -// http://www.dotmasr.eg/ -مصر +// loans : 2014-03-20 June Woods, LLC +loans -// xn--node ("ge" Georgian (Mkhedruli)) : GE -გე +// auction : 2014-03-20 Sand Galley, LLC +auction -// xn--j6w193g ("Hong Kong" Chinese-Han) : HK -// https://www2.hkirc.hk/register/rules.jsp -香港 +// attorney : 2014-03-20 Victor North, LLC +attorney -// xn--h2brj9c ("Bharat" Devanagari) : IN -// India -भारत +// finance : 2014-03-20 Cotton Cypress, LLC +finance -// xn--mgbbh1a71e ("Bharat" Arabic) : IN -// India -بھارت +// investments : 2014-03-20 Holly Glen, LLC +investments -// xn--fpcrj9c3d ("Bharat" Telugu) : IN -// India -భారత్ +// juegos : 2014-03-20 Uniregistry, Corp. +juegos -// xn--gecrj9c ("Bharat" Gujarati) : IN -// India -ભારત +// dentist : 2014-03-20 Outer Lake, LLC +dentist -// xn--s9brj9c ("Bharat" Gurmukhi) : IN -// India -ਭਾਰਤ +// lds : 2014-03-20 IRI Domain Management, LLC +lds -// xn--45brj9c ("Bharat" Bengali) : IN -// India -ভারত +// lawyer : 2014-03-20 Atomic Station, LLC +lawyer -// xn--xkc2dl3a5ee0h ("India" Tamil) : IN -// India -இந்தியா +// surgery : 2014-03-20 Tin Avenue, LLC +surgery -// xn--mgba3a4f16a ("Iran" Persian) : IR -ایران +// gratis : 2014-03-20 Pioneer Tigers, LLC +gratis -// xn--mgba3a4fra ("Iran" Arabic) : IR -ايران +// software : 2014-03-20 Over Birch, LLC +software -// xn--mgbayh7gpa ("al-Ordon" Arabic) : JO -// National Information Technology Center (NITC) -// Royal Scientific Society, Al-Jubeiha -الاردن +// mortgage : 2014-03-20 Outer Gardens, LLC +mortgage -// xn--3e0b707e ("Republic of Korea" Hangul) : KR -한국 +// republican : 2014-03-20 United TLD Holdco Ltd. +republican -// xn--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK -// http://nic.lk -ලංකා +// credit : 2014-03-20 Snow Shadow, LLC +credit -// xn--xkc2al3hye2a ("Ilangai" Tamil) : LK -// http://nic.lk -இலங்கை +// tax : 2014-03-20 Storm Orchard, LLC +tax -// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA -المغرب +// africa : 2014-03-24 ZA Central Registry NPC trading as Registry.Africa +africa -// xn--mgb9awbf ("Oman" Arabic) : OM -عمان +// joburg : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry +joburg -// xn--ygbi2ammx ("Falasteen" Arabic) : PS -// The Palestinian National Internet Naming Authority (PNINA) -// http://www.pnina.ps -فلسطين +// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry +durban -// xn--90a3ac ("srb" Cyrillic) : RS -срб +// capetown : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry +capetown -// xn--p1ai ("rf" Russian-Cyrillic) : RU -// http://www.cctld.ru/en/docs/rulesrf.php -рф +// sap : 2014-03-27 SAP AG +sap -// xn--wgbl6a ("Qatar" Arabic) : QA -// http://www.ict.gov.qa/ -قطر +// datsun : 2014-03-27 NISSAN MOTOR CO., LTD. +datsun -// xn--mgberp4a5d4ar ("AlSaudiah" Arabic) : SA -// http://www.nic.net.sa/ -السعودية +// infiniti : 2014-03-27 NISSAN MOTOR CO., LTD. +infiniti -// xn--mgberp4a5d4a87g ("AlSaudiah" Arabic) variant : SA -السعودیة +// firmdale : 2014-03-27 Firmdale Holdings Limited +firmdale -// xn--mgbqly7c0a67fbc ("AlSaudiah" Arabic) variant : SA -السعودیۃ +// organic : 2014-03-27 Afilias Limited +organic -// xn--mgbqly7cvafr ("AlSaudiah" Arabic) variant : SA -السعوديه +// nissan : 2014-03-27 NISSAN MOTOR CO., LTD. +nissan -// xn--ogbpf8fl ("Syria" Arabic) : SY -سورية +// website : 2014-04-03 DotWebsite Inc. +website -// xn--mgbtf8fl ("Syria" Arabic) variant : SY -سوريا +// space : 2014-04-03 DotSpace Inc. +space -// xn--yfro4i67o Singapore ("Singapore" Chinese-Han) : SG -新加坡 +// schmidt : 2014-04-03 SALM S.A.S. +schmidt -// xn--clchc0ea0b2g2a9gcd ("Singapore" Tamil) : SG -சிங்கப்பூர் +// cuisinella : 2014-04-03 SALM S.A.S. +cuisinella -// xn--o3cw4h ("Thai" Thai) : TH -// http://www.thnic.co.th -ไทย +// samsung : 2014-04-03 SAMSUNG SDS CO., LTD +samsung -// xn--pgbs0dh ("Tunis") : TN -// http://nic.tn -تونس +// crs : 2014-04-03 Federated Co operatives Limited +crs -// xn--kpry57d ("Taiwan" Chinese-Han-Traditional) : TW -// http://www.twnic.net/english/dn/dn_07a.htm -台灣 +// doosan : 2014-04-03 Doosan Corporation +doosan -// xn--kprw13d ("Taiwan" Chinese-Han-Simplified) : TW -// http://www.twnic.net/english/dn/dn_07a.htm -台湾 +// press : 2014-04-03 DotPress Inc. +press -// xn--nnx388a ("Taiwan") variant : TW -臺灣 +// emerck : 2014-04-03 Merck KGaA +emerck -// xn--j1amh ("ukr" Cyrillic) : UA -укр +// erni : 2014-04-03 ERNI Group Holding AG +erni -// xn--mgb2ddes ("AlYemen" Arabic) : YE -اليمن +// direct : 2014-04-10 Half Trail, LLC +direct -// xxx : http://icmregistry.com -xxx +// yandex : 2014-04-10 YANDEX, LLC +yandex -// ye : http://www.y.net.ye/services/domain_name.htm -*.ye +// lotto : 2014-04-10 Afilias Limited +lotto -// za : http://www.zadna.org.za/slds.html -*.za +// toshiba : 2014-04-10 TOSHIBA Corporation +toshiba -// zm : http://en.wikipedia.org/wiki/.zm -*.zm +// bauhaus : 2014-04-17 Werkhaus GmbH +bauhaus -// zw : http://en.wikipedia.org/wiki/.zw -*.zw +// 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/ -// Requested by Donavan Miller <donavanm(a)amazon.com> 2013-03-22 +// Submitted by Donavan Miller <donavanm(a)amazon.com> 2013-03-22 cloudfront.net // Amazon Elastic Compute Cloud: https://aws.amazon.com/ec2/ -// Requested by Osman Surkatty <osmans(a)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(a)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/ -// Requested by Adam Stein <astein(a)amazon.com> 2013-04-02 +// Amazon Elastic Beanstalk : https://aws.amazon.com/elasticbeanstalk/ +// Submitted by Adam Stein <astein(a)amazon.com> 2013-04-02 elasticbeanstalk.com // Amazon Elastic Load Balancing : https://aws.amazon.com/elasticloadbalancing/ -// Requested by Scott Vidmar <svidmar(a)amazon.com> 2013-03-27 +// Submitted by Scott Vidmar <svidmar(a)amazon.com> 2013-03-27 elb.amazonaws.com // Amazon S3 : https://aws.amazon.com/s3/ -// Requested by Courtney Eckhardt <coec(a)amazon.com> 2013-03-22 +// Submitted by Courtney Eckhardt <coec(a)amazon.com> 2013-03-22 s3.amazonaws.com s3-us-west-2.amazonaws.com s3-us-west-1.amazonaws.com @@ -6608,26 +8051,27 @@ s3-website-sa-east-1.amazonaws.com s3-website-us-gov-west-1.amazonaws.com // BetaInABox -// Requested by adrian(a)betainabox.com 2012-09-13 +// Submitted by adrian(a)betainabox.com 2012-09-13 betainabox.com // CentralNic : http://www.centralnic.com/names/domains -// Requested by registry <gavin.brown(a)centralnic.com> 2012-09-27 +// Submitted by registry <gavin.brown(a)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 -gr.com hu.com hu.net jp.net jpn.com kr.com +mex.com no.com qc.com ru.com @@ -6637,13 +8081,38 @@ se.net uk.com uk.net us.com -us.org uy.com +za.bz za.com +// Africa.com Web Solutions Ltd : https://registry.africa.com +// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 +africa.com + +// iDOT Services Limited : http://www.domain.gr.com +// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 +gr.com + +// Radix FZC : http://domains.in.net +// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 +in.net + +// US REGISTRY LLC : http://us.org +// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 +us.org + +// co.com Registry, LLC : https://registry.co.com +// Submitted by Gavin Brown <gavin.brown(a)centralnic.com> 2014-02-04 +co.com + // c.la : http://www.c.la/ c.la +// cloudControl : https://www.cloudcontrol.com/ +// Submitted by Tobias Wilken <tw(a)cloudcontrol.com> 2013-07-23 +cloudcontrolled.com +cloudcontrolapp.com + // co.ca : http://registry.co.ca/ co.ca @@ -6651,8 +8120,12 @@ co.ca co.nl co.no +// Cupcake : https://cupcake.io/ +// Submitted by Jonathan Rudenberg <jonathan(a)cupcake.io> 2013-10-08 +cupcake.is + // DreamHost : http://www.dreamhost.com/ -// Requested by Andrew Farmer <andrew.farmer(a)dreamhost.com> 2012-10-02 +// Submitted by Andrew Farmer <andrew.farmer(a)dreamhost.com> 2012-10-02 dreamhosters.com // DynDNS.com : http://www.dyndns.com/services/dns/dyndns/ @@ -6936,12 +8409,29 @@ webhop.org worse-than.tv writesthisblog.com +// Fastly Inc. http://www.fastly.com/ +// Submitted by Vladimir Vuksan <vladimir(a)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(a)firebase.com> 2014-01-21 +firebaseapp.com + // GitHub, Inc. -// Requested by Ben Toews <btoews(a)github.com> 2013-04-18 +// Submitted by Ben Toews <btoews(a)github.com> 2014-02-06 github.io +githubusercontent.com + +// GlobeHosting, Inc. +// Submitted by Zoltan Egresi <egresi(a)globehosting.com> 2013-07-12 +ro.com // Google, Inc. -// Requested by Eduardo Vela <evn(a)google.com> 2012-10-24 +// Submitted by Eduardo Vela <evn(a)google.com> 2012-10-24 appspot.com blogspot.be blogspot.bj @@ -6986,14 +8476,15 @@ blogspot.tw codespot.com googleapis.com googlecode.com +withgoogle.com // Heroku : https://www.heroku.com/ -// Requested by Tom Maher <tmaher(a)heroku.com> 2013-05-02 +// Submitted by Tom Maher <tmaher(a)heroku.com> 2013-05-02 herokuapp.com herokussl.com // iki.fi -// Requested by Hannu Aronsson <haa(a)iki.fi> 2009-11-05 +// Submitted by Hannu Aronsson <haa(a)iki.fi> 2009-11-05 iki.fi // info.at : http://www.info.at/ @@ -7003,24 +8494,42 @@ info.at // Michau Enterprises Limited : http://www.co.pl/ co.pl +// Microsoft : http://microsoft.com +// Submitted by Barry Dorrans <bdorrans(a)microsoft.com> 2014-01-24 +azurewebsites.net +azure-mobile.net +cloudapp.net + +// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/ +// Submitted by Jeff Wheelhouse <support(a)nearlyfreespeech.net> 2014-02-02 +nfshost.com + // NYC.mn : http://www.information.nyc.mn -// Requested by Matthew Brown <mattbrown(a)nyc.mn> 2013-03-11 +// Submitted by Matthew Brown <mattbrown(a)nyc.mn> 2013-03-11 nyc.mn +// One Fold Media : http://www.onefoldmedia.com/ +// Submitted by Eddie Jones <eddie(a)onefoldmedia.com> 2014-06-10 +nid.io + // Opera Software, A.S.A. -// Requested by Yngve Pettersen <yngve(a)opera.com> 2009-11-26 +// Submitted by Yngve Pettersen <yngve(a)opera.com> 2009-11-26 operaunite.com +// OutSystems +// Submitted by Duarte Santos <domain-admin(a)outsystemscloud.com> 2014-03-11 +outsystemscloud.com + // Red Hat, Inc. OpenShift : https://openshift.redhat.com/ -// Requested by Tim Kramer <tkramer(a)rhcloud.com> 2012-10-24 +// Submitted by Tim Kramer <tkramer(a)rhcloud.com> 2012-10-24 rhcloud.com // priv.at : http://www.nic.priv.at/ -// Requested by registry <lendl(a)nic.at> 2008-06-09 +// Submitted by registry <lendl(a)nic.at> 2008-06-09 priv.at // ZaNiC : http://www.za.net/ -// Requested by registry <hostmaster(a)nic.za.net> 2009-10-03 +// Submitted by registry <hostmaster(a)nic.za.net> 2009-10-03 za.net za.org

1 0

[tor-browser/esr24] Bug 999651, bug 995679, bug 1009952, bug 1011007, bug 991981. r=sfink, r=shu, r=jandem, r=jdm, r=luke, r=bbouvier, r=nmatsakis, r=bz, r=ehsan, r=jgilbert, r=smaug, r=sicking, r=terrence, r=bholley, r=bent, r=efaust, r=jorendorff, a=lmandel
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 9aeffb05a552f1beb1ff37adc88df0640ffa8ca3 Author: Jeff Walden <jwalden(a)mit.edu> Date: Mon Jun 2 11:25:43 2014 -0700 Bug 999651, bug 995679, bug 1009952, bug 1011007, bug 991981. r=sfink, r=shu, r=jandem, r=jdm, r=luke, r=bbouvier, r=nmatsakis, r=bz, r=ehsan, r=jgilbert, r=smaug, r=sicking, r=terrence, r=bholley, r=bent, r=efaust, r=jorendorff, a=lmandel --HG-- extra : rebase_source : 2487b6e09f4caf827c3ba5e0283e3d30c74e5d42 --- CLOBBER | 2 +- content/base/src/WebSocket.cpp | 10 +- content/base/src/nsDOMDataChannel.cpp | 10 +- content/base/src/nsDOMParser.cpp | 2 + content/base/src/nsXMLHttpRequest.cpp | 11 +- content/canvas/src/CanvasRenderingContext2D.cpp | 14 +- content/canvas/src/CanvasRenderingContext2D.h | 3 +- content/canvas/src/WebGLContext.h | 15 ++ content/canvas/src/WebGLContextGL.cpp | 43 ++++- content/html/content/public/HTMLAudioElement.h | 1 + content/media/webaudio/AnalyserNode.cpp | 6 + content/media/webaudio/AudioContext.cpp | 17 +- content/media/webaudio/AudioParam.h | 1 + content/media/webaudio/BiquadFilterNode.cpp | 4 + content/media/webaudio/WaveShaperNode.cpp | 2 + dom/bindings/TypedArray.h | 88 +++++++---- dom/encoding/TextDecoder.h | 1 + dom/workers/TextDecoder.h | 1 + js/src/builtin/TestingFunctions.cpp | 50 ++++++ js/src/jit/IonBuilder.cpp | 92 +---------- js/src/jit/MIR.h | 10 +- js/src/js.msg | 4 +- js/src/jsfriendapi.h | 111 +++++++++++++ js/src/jstypedarray.cpp | 190 +++++++++++++++++------ js/src/jstypedarray.h | 16 +- js/src/jstypedarrayinlines.h | 8 + netwerk/base/src/ArrayBufferInputStream.cpp | 11 ++ xpcom/io/nsBinaryStream.cpp | 56 +++++-- 28 files changed, 561 insertions(+), 218 deletions(-) diff --git a/CLOBBER b/CLOBBER index 469d72c..550e8c1 100644 --- a/CLOBBER +++ b/CLOBBER @@ -18,4 +18,4 @@ # Modifying this file will now automatically clobber the buildbot machines \o/ # -Bug 902908 renamed js/src/ion to js/src/jit and required a clobber \ No newline at end of file +Bug 999651 et al. require a clobber for some unknown reason diff --git a/content/base/src/WebSocket.cpp b/content/base/src/WebSocket.cpp index aba7007..2953aa3 100644 --- a/content/base/src/WebSocket.cpp +++ b/content/base/src/WebSocket.cpp @@ -1221,7 +1221,10 @@ WebSocket::Send(ArrayBuffer& aData, { NS_ABORT_IF_FALSE(NS_IsMainThread(), "Not running on main thread"); - MOZ_ASSERT(sizeof(*aData.Data()) == 1); + aData.ComputeLengthAndData(); + + static_assert(sizeof(*aData.Data()) == 1, "byte-sized data required"); + uint32_t len = aData.Length(); char* data = reinterpret_cast<char*>(aData.Data()); @@ -1235,7 +1238,10 @@ WebSocket::Send(ArrayBufferView& aData, { NS_ABORT_IF_FALSE(NS_IsMainThread(), "Not running on main thread"); - MOZ_ASSERT(sizeof(*aData.Data()) == 1); + aData.ComputeLengthAndData(); + + static_assert(sizeof(*aData.Data()) == 1, "byte-sized data required"); + uint32_t len = aData.Length(); char* data = reinterpret_cast<char*>(aData.Data()); diff --git a/content/base/src/nsDOMDataChannel.cpp b/content/base/src/nsDOMDataChannel.cpp index 3e038de..a7f4d93 100644 --- a/content/base/src/nsDOMDataChannel.cpp +++ b/content/base/src/nsDOMDataChannel.cpp @@ -292,7 +292,10 @@ nsDOMDataChannel::Send(ArrayBuffer& aData, ErrorResult& aRv) { NS_ABORT_IF_FALSE(NS_IsMainThread(), "Not running on main thread"); - MOZ_ASSERT(sizeof(*aData.Data()) == 1); + aData.ComputeLengthAndData(); + + static_assert(sizeof(*aData.Data()) == 1, "byte-sized data required"); + uint32_t len = aData.Length(); char* data = reinterpret_cast<char*>(aData.Data()); @@ -305,7 +308,10 @@ nsDOMDataChannel::Send(ArrayBufferView& aData, ErrorResult& aRv) { NS_ABORT_IF_FALSE(NS_IsMainThread(), "Not running on main thread"); - MOZ_ASSERT(sizeof(*aData.Data()) == 1); + aData.ComputeLengthAndData(); + + static_assert(sizeof(*aData.Data()) == 1, "byte-sized data required"); + uint32_t len = aData.Length(); char* data = reinterpret_cast<char*>(aData.Data()); diff --git a/content/base/src/nsDOMParser.cpp b/content/base/src/nsDOMParser.cpp index 0ab06d9..c6bc60d 100644 --- a/content/base/src/nsDOMParser.cpp +++ b/content/base/src/nsDOMParser.cpp @@ -137,6 +137,8 @@ already_AddRefed<nsIDocument> nsDOMParser::ParseFromBuffer(const Uint8Array& aBuf, uint32_t aBufLen, SupportedType aType, ErrorResult& rv) { + aBuf.ComputeLengthAndData(); + if (aBufLen > aBuf.Length()) { rv.Throw(NS_ERROR_XPC_NOT_ENOUGH_ELEMENTS_IN_ARRAY); return nullptr; diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 22fe0c8..418edae 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -2440,6 +2440,7 @@ GetRequestBody(nsIVariant* aBody, nsIInputStream** aResult, uint64_t* aContentLe JS::Rooted<JSObject*> obj(cx, JSVAL_TO_OBJECT(realVal)); if (JS_IsArrayBufferObject(obj)) { ArrayBuffer buf(obj); + buf.ComputeLengthAndData(); return GetRequestBody(buf.Data(), buf.Length(), aResult, aContentLength, aContentType, aCharset); } @@ -2483,14 +2484,16 @@ nsXMLHttpRequest::GetRequestBody(nsIVariant* aVariant, switch (body.GetType()) { case nsXMLHttpRequest::RequestBody::ArrayBuffer: { - return ::GetRequestBody(value.mArrayBuffer->Data(), - value.mArrayBuffer->Length(), aResult, + const ArrayBuffer* buffer = value.mArrayBuffer; + buffer->ComputeLengthAndData(); + return ::GetRequestBody(buffer->Data(), buffer->Length(), aResult, aContentLength, aContentType, aCharset); } case nsXMLHttpRequest::RequestBody::ArrayBufferView: { - return ::GetRequestBody(value.mArrayBufferView->Data(), - value.mArrayBufferView->Length(), aResult, + const ArrayBufferView* view = value.mArrayBufferView; + view->ComputeLengthAndData(); + return ::GetRequestBody(view->Data(), view->Length(), aResult, aContentLength, aContentType, aCharset); } case nsXMLHttpRequest::RequestBody::Blob: diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp index 8c67a87..ea685f1 100644 --- a/content/canvas/src/CanvasRenderingContext2D.cpp +++ b/content/canvas/src/CanvasRenderingContext2D.cpp @@ -3559,7 +3559,7 @@ CanvasRenderingContext2D::PutImageData(ImageData& imageData, double dx, error = PutImageData_explicit(JS_DoubleToInt32(dx), JS_DoubleToInt32(dy), imageData.Width(), imageData.Height(), - arr.Data(), arr.Length(), false, 0, 0, 0, 0); + &arr, false, 0, 0, 0, 0); } void @@ -3573,7 +3573,7 @@ CanvasRenderingContext2D::PutImageData(ImageData& imageData, double dx, error = PutImageData_explicit(JS_DoubleToInt32(dx), JS_DoubleToInt32(dy), imageData.Width(), imageData.Height(), - arr.Data(), arr.Length(), true, + &arr, true, JS_DoubleToInt32(dirtyX), JS_DoubleToInt32(dirtyY), JS_DoubleToInt32(dirtyWidth), @@ -3585,7 +3585,7 @@ CanvasRenderingContext2D::PutImageData(ImageData& imageData, double dx, nsresult CanvasRenderingContext2D::PutImageData_explicit(int32_t x, int32_t y, uint32_t w, uint32_t h, - unsigned char *aData, uint32_t aDataLen, + dom::Uint8ClampedArray* aArray, bool hasDirtyRect, int32_t dirtyX, int32_t dirtyY, int32_t dirtyWidth, int32_t dirtyHeight) { @@ -3638,8 +3638,12 @@ CanvasRenderingContext2D::PutImageData_explicit(int32_t x, int32_t y, uint32_t w return NS_OK; } + aArray->ComputeLengthAndData(); + + uint32_t dataLen = aArray->Length(); + uint32_t len = w * h * 4; - if (aDataLen != len) { + if (dataLen != len) { return NS_ERROR_DOM_SYNTAX_ERR; } @@ -3650,7 +3654,7 @@ CanvasRenderingContext2D::PutImageData_explicit(int32_t x, int32_t y, uint32_t w return NS_ERROR_FAILURE; } - uint8_t *src = aData; + uint8_t *src = aArray->Data(); uint8_t *dst = imgsurf->Data(); for (uint32_t j = 0; j < h; j++) { diff --git a/content/canvas/src/CanvasRenderingContext2D.h b/content/canvas/src/CanvasRenderingContext2D.h index d0f8fa0..0aff60d 100644 --- a/content/canvas/src/CanvasRenderingContext2D.h +++ b/content/canvas/src/CanvasRenderingContext2D.h @@ -21,6 +21,7 @@ #include "mozilla/dom/CanvasGradient.h" #include "mozilla/dom/CanvasRenderingContext2DBinding.h" #include "mozilla/dom/CanvasPattern.h" +#include "mozilla/dom/TypedArray.h" #include "mozilla/gfx/Rect.h" class nsXULElement; @@ -443,7 +444,7 @@ protected: JSObject** aRetval); nsresult PutImageData_explicit(int32_t x, int32_t y, uint32_t w, uint32_t h, - unsigned char *aData, uint32_t aDataLen, + dom::Uint8ClampedArray* aArray, bool hasDirtyRect, int32_t dirtyX, int32_t dirtyY, int32_t dirtyWidth, int32_t dirtyHeight); diff --git a/content/canvas/src/WebGLContext.h b/content/canvas/src/WebGLContext.h index e8e55db..db0c20a 100644 --- a/content/canvas/src/WebGLContext.h +++ b/content/canvas/src/WebGLContext.h @@ -585,6 +585,7 @@ public: WebGLfloat z, WebGLfloat w); void Uniform1iv(WebGLUniformLocation* location, dom::Int32Array& arr) { + arr.ComputeLengthAndData(); Uniform1iv_base(location, arr.Length(), arr.Data()); } void Uniform1iv(WebGLUniformLocation* location, @@ -595,6 +596,7 @@ public: const WebGLint* data); void Uniform2iv(WebGLUniformLocation* location, dom::Int32Array& arr) { + arr.ComputeLengthAndData(); Uniform2iv_base(location, arr.Length(), arr.Data()); } void Uniform2iv(WebGLUniformLocation* location, @@ -605,6 +607,7 @@ public: const WebGLint* data); void Uniform3iv(WebGLUniformLocation* location, dom::Int32Array& arr) { + arr.ComputeLengthAndData(); Uniform3iv_base(location, arr.Length(), arr.Data()); } void Uniform3iv(WebGLUniformLocation* location, @@ -615,6 +618,7 @@ public: const WebGLint* data); void Uniform4iv(WebGLUniformLocation* location, dom::Int32Array& arr) { + arr.ComputeLengthAndData(); Uniform4iv_base(location, arr.Length(), arr.Data()); } void Uniform4iv(WebGLUniformLocation* location, @@ -625,6 +629,7 @@ public: const WebGLint* data); void Uniform1fv(WebGLUniformLocation* location, dom::Float32Array& arr) { + arr.ComputeLengthAndData(); Uniform1fv_base(location, arr.Length(), arr.Data()); } void Uniform1fv(WebGLUniformLocation* location, @@ -635,6 +640,7 @@ public: const WebGLfloat* data); void Uniform2fv(WebGLUniformLocation* location, dom::Float32Array& arr) { + arr.ComputeLengthAndData(); Uniform2fv_base(location, arr.Length(), arr.Data()); } void Uniform2fv(WebGLUniformLocation* location, @@ -645,6 +651,7 @@ public: const WebGLfloat* data); void Uniform3fv(WebGLUniformLocation* location, dom::Float32Array& arr) { + arr.ComputeLengthAndData(); Uniform3fv_base(location, arr.Length(), arr.Data()); } void Uniform3fv(WebGLUniformLocation* location, @@ -655,6 +662,7 @@ public: const WebGLfloat* data); void Uniform4fv(WebGLUniformLocation* location, dom::Float32Array& arr) { + arr.ComputeLengthAndData(); Uniform4fv_base(location, arr.Length(), arr.Data()); } void Uniform4fv(WebGLUniformLocation* location, @@ -667,6 +675,7 @@ public: void UniformMatrix2fv(WebGLUniformLocation* location, WebGLboolean transpose, dom::Float32Array &value) { + value.ComputeLengthAndData(); UniformMatrix2fv_base(location, transpose, value.Length(), value.Data()); } void UniformMatrix2fv(WebGLUniformLocation* location, @@ -682,6 +691,7 @@ public: void UniformMatrix3fv(WebGLUniformLocation* location, WebGLboolean transpose, dom::Float32Array &value) { + value.ComputeLengthAndData(); UniformMatrix3fv_base(location, transpose, value.Length(), value.Data()); } void UniformMatrix3fv(WebGLUniformLocation* location, @@ -697,6 +707,7 @@ public: void UniformMatrix4fv(WebGLUniformLocation* location, WebGLboolean transpose, dom::Float32Array &value) { + value.ComputeLengthAndData(); UniformMatrix4fv_base(location, transpose, value.Length(), value.Data()); } void UniformMatrix4fv(WebGLUniformLocation* location, @@ -731,6 +742,7 @@ public: WebGLfloat x2, WebGLfloat x3); void VertexAttrib1fv(WebGLuint idx, dom::Float32Array &arr) { + arr.ComputeLengthAndData(); VertexAttrib1fv_base(idx, arr.Length(), arr.Data()); } void VertexAttrib1fv(WebGLuint idx, const dom::Sequence<WebGLfloat>& arr) { @@ -740,6 +752,7 @@ public: const WebGLfloat* ptr); void VertexAttrib2fv(WebGLuint idx, dom::Float32Array &arr) { + arr.ComputeLengthAndData(); VertexAttrib2fv_base(idx, arr.Length(), arr.Data()); } void VertexAttrib2fv(WebGLuint idx, const dom::Sequence<WebGLfloat>& arr) { @@ -749,6 +762,7 @@ public: const WebGLfloat* ptr); void VertexAttrib3fv(WebGLuint idx, dom::Float32Array &arr) { + arr.ComputeLengthAndData(); VertexAttrib3fv_base(idx, arr.Length(), arr.Data()); } void VertexAttrib3fv(WebGLuint idx, const dom::Sequence<WebGLfloat>& arr) { @@ -758,6 +772,7 @@ public: const WebGLfloat* ptr); void VertexAttrib4fv(WebGLuint idx, dom::Float32Array &arr) { + arr.ComputeLengthAndData(); VertexAttrib4fv_base(idx, arr.Length(), arr.Data()); } void VertexAttrib4fv(WebGLuint idx, const dom::Sequence<WebGLfloat>& arr) { diff --git a/content/canvas/src/WebGLContextGL.cpp b/content/canvas/src/WebGLContextGL.cpp index 6b4c77b..c1f943f 100644 --- a/content/canvas/src/WebGLContextGL.cpp +++ b/content/canvas/src/WebGLContextGL.cpp @@ -431,6 +431,8 @@ WebGLContext::BufferData(WebGLenum target, ArrayBuffer *data, WebGLenum usage) MakeContextCurrent(); InvalidateCachedMinInUseAttribArrayLength(); + data->ComputeLengthAndData(); + GLenum error = CheckedBufferData(target, data->Length(), data->Data(), usage); if (error) { @@ -469,6 +471,8 @@ WebGLContext::BufferData(WebGLenum target, ArrayBufferView& data, WebGLenum usag InvalidateCachedMinInUseAttribArrayLength(); MakeContextCurrent(); + data.ComputeLengthAndData(); + GLenum error = CheckedBufferData(target, data.Length(), data.Data(), usage); if (error) { GenerateWarning("bufferData generated error %s", ErrorName(error)); @@ -509,6 +513,8 @@ WebGLContext::BufferSubData(GLenum target, WebGLsizeiptr byteOffset, if (!boundBuffer) return ErrorInvalidOperation("bufferData: no buffer bound!"); + data->ComputeLengthAndData(); + CheckedUint32 checked_neededByteLength = CheckedUint32(byteOffset) + data->Length(); if (!checked_neededByteLength.isValid()) return ErrorInvalidValue("bufferSubData: integer overflow computing the needed byte length"); @@ -547,6 +553,8 @@ WebGLContext::BufferSubData(WebGLenum target, WebGLsizeiptr byteOffset, if (!boundBuffer) return ErrorInvalidOperation("bufferSubData: no buffer bound!"); + data.ComputeLengthAndData(); + CheckedUint32 checked_neededByteLength = CheckedUint32(byteOffset) + data.Length(); if (!checked_neededByteLength.isValid()) return ErrorInvalidValue("bufferSubData: integer overflow computing the needed byte length"); @@ -3382,7 +3390,11 @@ WebGLContext::ReadPixels(WebGLint x, WebGLint y, WebGLsizei width, if (!checked_neededByteLength.isValid()) return ErrorInvalidOperation("readPixels: integer overflow computing the needed buffer size"); - uint32_t dataByteLen = JS_GetTypedArrayByteLength(pixels->Obj()); + // Compute length and data. Don't reenter after this point, lest the + // precomputed go out of sync with the instant length/data. + pixels->ComputeLengthAndData(); + + uint32_t dataByteLen = pixels->Length(); if (checked_neededByteLength.value() > dataByteLen) return ErrorInvalidOperation("readPixels: buffer too small"); @@ -4584,6 +4596,8 @@ WebGLContext::CompressedTexImage2D(WebGLenum target, WebGLint level, WebGLenum i return; } + view.ComputeLengthAndData(); + uint32_t byteLength = view.Length(); if (!ValidateCompressedTextureSize(target, level, internalformat, width, height, byteLength, "compressedTexImage2D")) { return; @@ -4633,6 +4647,8 @@ WebGLContext::CompressedTexSubImage2D(WebGLenum target, WebGLint level, WebGLint return; } + view.ComputeLengthAndData(); + uint32_t byteLength = view.Length(); if (!ValidateCompressedTextureSize(target, level, format, width, height, byteLength, "compressedTexSubImage2D")) { return; @@ -5135,10 +5151,23 @@ WebGLContext::TexImage2D(WebGLenum target, WebGLint level, if (!IsContextStable()) return; + void* data; + uint32_t length; + int jsArrayType; + if (!pixels) { + data = nullptr; + length = 0; + jsArrayType = -1; + } else { + pixels->ComputeLengthAndData(); + + data = pixels->Data(); + length = pixels->Length(); + jsArrayType = int(JS_GetArrayBufferViewType(pixels->Obj())); + } + return TexImage2D_base(target, level, internalformat, width, height, 0, border, format, type, - pixels ? pixels->Data() : 0, - pixels ? pixels->Length() : 0, - pixels ? (int)JS_GetArrayBufferViewType(pixels->Obj()) : -1, + data, length, jsArrayType, WebGLTexelConversions::Auto, false); } @@ -5156,6 +5185,8 @@ WebGLContext::TexImage2D(WebGLenum target, WebGLint level, } Uint8ClampedArray arr(pixels->GetDataObject()); + arr.ComputeLengthAndData(); + return TexImage2D_base(target, level, internalformat, pixels->Width(), pixels->Height(), 4*pixels->Width(), 0, format, type, arr.Data(), arr.Length(), -1, @@ -5289,6 +5320,8 @@ WebGLContext::TexSubImage2D(WebGLenum target, WebGLint level, if (!pixels) return ErrorInvalidValue("texSubImage2D: pixels must not be null!"); + pixels->ComputeLengthAndData(); + return TexSubImage2D_base(target, level, xoffset, yoffset, width, height, 0, format, type, pixels->Data(), pixels->Length(), @@ -5309,6 +5342,8 @@ WebGLContext::TexSubImage2D(WebGLenum target, WebGLint level, return ErrorInvalidValue("texSubImage2D: pixels must not be null!"); Uint8ClampedArray arr(pixels->GetDataObject()); + arr.ComputeLengthAndData(); + return TexSubImage2D_base(target, level, xoffset, yoffset, pixels->Width(), pixels->Height(), 4*pixels->Width(), format, type, diff --git a/content/html/content/public/HTMLAudioElement.h b/content/html/content/public/HTMLAudioElement.h index 49fcd23..3c19e84 100644 --- a/content/html/content/public/HTMLAudioElement.h +++ b/content/html/content/public/HTMLAudioElement.h @@ -63,6 +63,7 @@ public: uint32_t MozWriteAudio(const Float32Array& aData, ErrorResult& aRv) { + aData.ComputeLengthAndData(); return MozWriteAudio(aData.Data(), aData.Length(), aRv); } uint32_t MozWriteAudio(const Sequence<float>& aData, ErrorResult& aRv) diff --git a/content/media/webaudio/AnalyserNode.cpp b/content/media/webaudio/AnalyserNode.cpp index d5fbe9c..613852d 100644 --- a/content/media/webaudio/AnalyserNode.cpp +++ b/content/media/webaudio/AnalyserNode.cpp @@ -150,6 +150,8 @@ AnalyserNode::GetFloatFrequencyData(Float32Array& aArray) return; } + aArray.ComputeLengthAndData(); + float* buffer = aArray.Data(); uint32_t length = std::min(aArray.Length(), mOutputBuffer.Length()); @@ -168,6 +170,8 @@ AnalyserNode::GetByteFrequencyData(Uint8Array& aArray) const double rangeScaleFactor = 1.0 / (mMaxDecibels - mMinDecibels); + aArray.ComputeLengthAndData(); + unsigned char* buffer = aArray.Data(); uint32_t length = std::min(aArray.Length(), mOutputBuffer.Length()); @@ -183,6 +187,8 @@ AnalyserNode::GetByteFrequencyData(Uint8Array& aArray) void AnalyserNode::GetByteTimeDomainData(Uint8Array& aArray) { + aArray.ComputeLengthAndData(); + unsigned char* buffer = aArray.Data(); uint32_t length = std::min(aArray.Length(), mBuffer.Length()); diff --git a/content/media/webaudio/AudioContext.cpp b/content/media/webaudio/AudioContext.cpp index 1bf78ef..3ef2ff4 100644 --- a/content/media/webaudio/AudioContext.cpp +++ b/content/media/webaudio/AudioContext.cpp @@ -169,18 +169,20 @@ AudioContext::CreateBuffer(JSContext* aJSContext, ArrayBuffer& aBuffer, return nullptr; } + aBuffer.ComputeLengthAndData(); + + uint32_t len = aBuffer.Length(); + uint8_t* data = aBuffer.Data(); + // Sniff the content of the media. // Failed type sniffing will be handled by SyncDecodeMedia. nsAutoCString contentType; - NS_SniffContent(NS_DATA_SNIFFER_CATEGORY, nullptr, - aBuffer.Data(), aBuffer.Length(), - contentType); + NS_SniffContent(NS_DATA_SNIFFER_CATEGORY, nullptr, data, len, contentType); nsRefPtr<WebAudioDecodeJob> job = new WebAudioDecodeJob(contentType, this, aBuffer); - if (mDecoder.SyncDecodeMedia(contentType.get(), - aBuffer.Data(), aBuffer.Length(), *job) && + if (mDecoder.SyncDecodeMedia(contentType.get(), data, len, *job) && job->mOutput) { nsRefPtr<AudioBuffer> buffer = job->mOutput.forget(); if (aMixToMono) { @@ -342,6 +344,9 @@ AudioContext::CreatePeriodicWave(const Float32Array& aRealData, const Float32Array& aImagData, ErrorResult& aRv) { + aRealData.ComputeLengthAndData(); + aImagData.ComputeLengthAndData(); + if (aRealData.Length() != aImagData.Length() || aRealData.Length() == 0 || aRealData.Length() > 4096) { @@ -369,6 +374,8 @@ AudioContext::DecodeAudioData(const ArrayBuffer& aBuffer, DecodeSuccessCallback& aSuccessCallback, const Optional<OwningNonNull<DecodeErrorCallback> >& aFailureCallback) { + aBuffer.ComputeLengthAndData(); + // Sniff the content of the media. // Failed type sniffing will be handled by AsyncDecodeMedia. nsAutoCString contentType; diff --git a/content/media/webaudio/AudioParam.h b/content/media/webaudio/AudioParam.h index e735b59..e6d95b0 100644 --- a/content/media/webaudio/AudioParam.h +++ b/content/media/webaudio/AudioParam.h @@ -57,6 +57,7 @@ public: aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR); return; } + aValues.ComputeLengthAndData(); AudioParamTimeline::SetValueCurveAtTime(aValues.Data(), aValues.Length(), aStartTime, aDuration, aRv); mCallback(mNode); diff --git a/content/media/webaudio/BiquadFilterNode.cpp b/content/media/webaudio/BiquadFilterNode.cpp index fe45106..fa4f1d1 100644 --- a/content/media/webaudio/BiquadFilterNode.cpp +++ b/content/media/webaudio/BiquadFilterNode.cpp @@ -247,6 +247,10 @@ BiquadFilterNode::GetFrequencyResponse(const Float32Array& aFrequencyHz, Float32Array& aMagResponse, Float32Array& aPhaseResponse) { + aFrequencyHz.ComputeLengthAndData(); + aMagResponse.ComputeLengthAndData(); + aPhaseResponse.ComputeLengthAndData(); + uint32_t length = std::min(std::min(aFrequencyHz.Length(), aMagResponse.Length()), aPhaseResponse.Length()); if (!length) { diff --git a/content/media/webaudio/WaveShaperNode.cpp b/content/media/webaudio/WaveShaperNode.cpp index 22df163..fa39637 100644 --- a/content/media/webaudio/WaveShaperNode.cpp +++ b/content/media/webaudio/WaveShaperNode.cpp @@ -125,6 +125,8 @@ WaveShaperNode::SetCurve(const Float32Array* aCurve) if (aCurve) { mCurve = aCurve->Obj(); + aCurve->ComputeLengthAndData(); + curve.SetLength(aCurve->Length()); PodCopy(curve.Elements(), aCurve->Data(), aCurve->Length()); } else { diff --git a/dom/bindings/TypedArray.h b/dom/bindings/TypedArray.h index 6531f2f..c7c2bbd 100644 --- a/dom/bindings/TypedArray.h +++ b/dom/bindings/TypedArray.h @@ -20,30 +20,43 @@ namespace dom { * or array buffer object. */ template<typename T, - JSObject* UnboxArray(JSObject*, uint32_t*, T**)> + JSObject* UnwrapArray(JSObject*), + void GetLengthAndData(JSObject*, uint32_t*, T**)> struct TypedArray_base { TypedArray_base(JSObject* obj) + : mObj(obj), + mData(NULL), + mLength(0), + mComputed(false) { - mObj = UnboxArray(obj, &mLength, &mData); + MOZ_ASSERT(obj != NULL); } private: - T* mData; - uint32_t mLength; JSObject* mObj; + mutable T* mData; + mutable uint32_t mLength; + mutable bool mComputed; public: + inline bool Init(JSObject* obj) + { + MOZ_ASSERT(!inited()); + DoInit(obj); + return inited(); + } + inline bool inited() const { return !!mObj; } inline T *Data() const { - MOZ_ASSERT(inited()); + MOZ_ASSERT(mComputed); return mData; } inline uint32_t Length() const { - MOZ_ASSERT(inited()); + MOZ_ASSERT(mComputed); return mLength; } @@ -51,16 +64,31 @@ public: MOZ_ASSERT(inited()); return mObj; } + + inline void ComputeLengthAndData() const + { + MOZ_ASSERT(inited()); + MOZ_ASSERT(!mComputed); + GetLengthAndData(mObj, &mLength, &mData); + mComputed = true; + } + +protected: + inline void DoInit(JSObject* obj) + { + mObj = UnwrapArray(obj); + } }; template<typename T, + JSObject* UnwrapArray(JSObject*), T* GetData(JSObject*), - JSObject* UnboxArray(JSObject*, uint32_t*, T**), + void GetLengthAndData(JSObject*, uint32_t*, T**), JSObject* CreateNew(JSContext*, uint32_t)> -struct TypedArray : public TypedArray_base<T,UnboxArray> { +struct TypedArray : public TypedArray_base<T, UnwrapArray, GetLengthAndData> { TypedArray(JSObject* obj) : - TypedArray_base<T,UnboxArray>(obj) + TypedArray_base<T, UnwrapArray, GetLengthAndData>(obj) {} static inline JSObject* @@ -83,37 +111,37 @@ struct TypedArray : public TypedArray_base<T,UnboxArray> { } }; -typedef TypedArray<int8_t, JS_GetInt8ArrayData, JS_GetObjectAsInt8Array, - JS_NewInt8Array> +typedef TypedArray<int8_t, js::UnwrapInt8Array, JS_GetInt8ArrayData, + js::GetInt8ArrayLengthAndData, JS_NewInt8Array> Int8Array; -typedef TypedArray<uint8_t, JS_GetUint8ArrayData, - JS_GetObjectAsUint8Array, JS_NewUint8Array> +typedef TypedArray<uint8_t, js::UnwrapUint8Array, JS_GetUint8ArrayData, + js::GetUint8ArrayLengthAndData, JS_NewUint8Array> Uint8Array; -typedef TypedArray<uint8_t, JS_GetUint8ClampedArrayData, - JS_GetObjectAsUint8ClampedArray, JS_NewUint8ClampedArray> +typedef TypedArray<uint8_t, js::UnwrapUint8ClampedArray, JS_GetUint8ClampedArrayData, + js::GetUint8ClampedArrayLengthAndData, JS_NewUint8ClampedArray> Uint8ClampedArray; -typedef TypedArray<int16_t, JS_GetInt16ArrayData, - JS_GetObjectAsInt16Array, JS_NewInt16Array> +typedef TypedArray<int16_t, js::UnwrapInt16Array, JS_GetInt16ArrayData, + js::GetInt16ArrayLengthAndData, JS_NewInt16Array> Int16Array; -typedef TypedArray<uint16_t, JS_GetUint16ArrayData, - JS_GetObjectAsUint16Array, JS_NewUint16Array> +typedef TypedArray<uint16_t, js::UnwrapUint16Array, JS_GetUint16ArrayData, + js::GetUint16ArrayLengthAndData, JS_NewUint16Array> Uint16Array; -typedef TypedArray<int32_t, JS_GetInt32ArrayData, - JS_GetObjectAsInt32Array, JS_NewInt32Array> +typedef TypedArray<int32_t, js::UnwrapInt32Array, JS_GetInt32ArrayData, + js::GetInt32ArrayLengthAndData, JS_NewInt32Array> Int32Array; -typedef TypedArray<uint32_t, JS_GetUint32ArrayData, - JS_GetObjectAsUint32Array, JS_NewUint32Array> +typedef TypedArray<uint32_t, js::UnwrapUint32Array, JS_GetUint32ArrayData, + js::GetUint32ArrayLengthAndData, JS_NewUint32Array> Uint32Array; -typedef TypedArray<float, JS_GetFloat32ArrayData, - JS_GetObjectAsFloat32Array, JS_NewFloat32Array> +typedef TypedArray<float, js::UnwrapFloat32Array, JS_GetFloat32ArrayData, + js::GetFloat32ArrayLengthAndData, JS_NewFloat32Array> Float32Array; -typedef TypedArray<double, JS_GetFloat64ArrayData, - JS_GetObjectAsFloat64Array, JS_NewFloat64Array> +typedef TypedArray<double, js::UnwrapFloat64Array, JS_GetFloat64ArrayData, + js::GetFloat64ArrayLengthAndData, JS_NewFloat64Array> Float64Array; -typedef TypedArray_base<uint8_t, JS_GetObjectAsArrayBufferView> +typedef TypedArray_base<uint8_t, js::UnwrapArrayBufferView, js::GetArrayBufferViewLengthAndData> ArrayBufferView; -typedef TypedArray<uint8_t, JS_GetArrayBufferData, - JS_GetObjectAsArrayBuffer, JS_NewArrayBuffer> +typedef TypedArray<uint8_t, js::UnwrapArrayBuffer, JS_GetArrayBufferData, + js::GetArrayBufferLengthAndData, JS_NewArrayBuffer> ArrayBuffer; } // namespace dom diff --git a/dom/encoding/TextDecoder.h b/dom/encoding/TextDecoder.h index d309209..3db00a4 100644 --- a/dom/encoding/TextDecoder.h +++ b/dom/encoding/TextDecoder.h @@ -66,6 +66,7 @@ public: const TextDecodeOptions& aOptions, nsAString& aOutDecodedString, ErrorResult& aRv) { + aView.ComputeLengthAndData(); TextDecoderBase::Decode(reinterpret_cast<char*>(aView.Data()), aView.Length(), aOptions.mStream, aOutDecodedString, aRv); diff --git a/dom/workers/TextDecoder.h b/dom/workers/TextDecoder.h index 6c88a70..205afc5 100644 --- a/dom/workers/TextDecoder.h +++ b/dom/workers/TextDecoder.h @@ -49,6 +49,7 @@ public: const TextDecodeOptionsWorkers& aOptions, nsAString& aOutDecodedString, ErrorResult& aRv) { + aView.ComputeLengthAndData(); TextDecoderBase::Decode(reinterpret_cast<char*>(aView.Data()), aView.Length(), aOptions.mStream, aOutDecodedString, aRv); diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp index 24cb2d7..ce6d633 100644 --- a/js/src/builtin/TestingFunctions.cpp +++ b/js/src/builtin/TestingFunctions.cpp @@ -999,6 +999,49 @@ js::IsAsmJSFunction(JSContext *cx, unsigned argc, Value *vp) } #endif +static JSBool +Neuter(JSContext *cx, unsigned argc, jsval *vp) +{ + CallArgs args = CallArgsFromVp(argc, vp); + + if (args.length() != 2) { + JS_ReportError(cx, "wrong number of arguments to neuter()"); + return false; + } + + RootedObject obj(cx); + if (!JS_ValueToObject(cx, args[0], obj.address())) + return false; + + if (!obj) { + JS_ReportError(cx, "neuter must be passed an object"); + return false; + } + + NeuterDataDisposition changeData; + RootedValue v(cx, args[1]); + RootedString str(cx, ToString<CanGC>(cx, v)); + if (!str) + return false; + JSAutoByteString dataDisposition(cx, str); + if (!dataDisposition) + return false; + if (strcmp(dataDisposition.ptr(), "same-data") == 0) { + changeData = KeepData; + } else if (strcmp(dataDisposition.ptr(), "change-data") == 0) { + changeData = ChangeData; + } else { + JS_ReportError(cx, "unknown parameter 2 to neuter()"); + return false; + } + + if (!js::NeuterArrayBuffer(cx, obj, changeData)) + return false; + + args.rval().setUndefined(); + return true; +} + static JSFunctionSpecWithHelp TestingFunctions[] = { JS_FN_HELP("gc", ::GC, 0, 0, "gc([obj] | 'compartment')", @@ -1177,6 +1220,13 @@ static JSFunctionSpecWithHelp TestingFunctions[] = { "getObjectMetadata(obj)", " Get the metadata for an object."), + JS_FN_HELP("neuter", Neuter, 1, 0, +"neuter(buffer, \"change-data\"|\"same-data\")", +" Neuter the given ArrayBuffer object as if it had been transferred to a\n" +" WebWorker. \"change-data\" will update the internal data pointer.\n" +" \"same-data\" will leave it set to its original value, to mimic eg\n" +" asm.js ArrayBuffer neutering."), + JS_FS_HELP_END }; diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index a0c70f5..2ceaf71 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -6446,29 +6446,12 @@ IonBuilder::jsop_getelem_dense() MInstruction * IonBuilder::getTypedArrayLength(MDefinition *obj) { - if (obj->isConstant() && obj->toConstant()->value().isObject()) { - JSObject *array = &obj->toConstant()->value().toObject(); - int32_t length = (int32_t) TypedArray::length(array); - obj->setFoldedUnchecked(); - return MConstant::New(Int32Value(length)); - } return MTypedArrayLength::New(obj); } MInstruction * IonBuilder::getTypedArrayElements(MDefinition *obj) { - if (obj->isConstant() && obj->toConstant()->value().isObject()) { - JSObject *array = &obj->toConstant()->value().toObject(); - void *data = TypedArray::viewData(array); - - // The 'data' pointer can change in rare circumstances - // (ArrayBufferObject::changeContents). - types::HeapTypeSet::WatchObjectStateChange(cx, array->getType(cx)); - - obj->setFoldedUnchecked(); - return MConstantElements::New(data); - } return MTypedArrayElements::New(obj); } @@ -6504,49 +6487,6 @@ IonBuilder::jsop_getelem_typed_static(bool *psucceeded) if (!LIRGenerator::allowStaticTypedArrayAccesses()) return true; - MDefinition *id = current->peek(-1); - MDefinition *obj = current->peek(-2); - - if (ElementAccessHasExtraIndexedProperty(cx, obj)) - return true; - - if (!obj->resultTypeSet()) - return true; - JSObject *typedArray = obj->resultTypeSet()->getSingleton(); - if (!typedArray) - return true; - JS_ASSERT(typedArray->isTypedArray()); - - ArrayBufferView::ViewType viewType = JS_GetArrayBufferViewType(typedArray); - - MDefinition *ptr = convertShiftToMaskForStaticTypedArray(id, viewType); - if (!ptr) - return true; - - obj->setFoldedUnchecked(); - - MLoadTypedArrayElementStatic *load = MLoadTypedArrayElementStatic::New(typedArray, ptr); - current->add(load); - - // The load is infallible if an undefined result will be coerced to the - // appropriate numeric type if the read is out of bounds. The truncation - // analysis picks up some of these cases, but is incomplete with respect - // to others. For now, sniff the bytecode for simple patterns following - // the load which guarantee a truncation or numeric conversion. - if (viewType == ArrayBufferView::TYPE_FLOAT32 || viewType == ArrayBufferView::TYPE_FLOAT64) { - jsbytecode *next = pc + JSOP_GETELEM_LENGTH; - if (*next == JSOP_POS) - load->setInfallible(); - } else { - jsbytecode *next = pc + JSOP_GETELEM_LENGTH; - if (*next == JSOP_ZERO && *(next + JSOP_ZERO_LENGTH) == JSOP_BITOR) - load->setInfallible(); - } - - current->popn(2); - current->push(load); - - *psucceeded = true; return true; } @@ -6854,37 +6794,7 @@ IonBuilder::jsop_setelem_typed_static(MDefinition *obj, MDefinition *id, MDefini if (!LIRGenerator::allowStaticTypedArrayAccesses()) return true; - if (ElementAccessHasExtraIndexedProperty(cx, obj)) - return true; - - if (!obj->resultTypeSet()) - return true; - JSObject *typedArray = obj->resultTypeSet()->getSingleton(); - if (!typedArray) - return true; - JS_ASSERT(typedArray->isTypedArray()); - - ArrayBufferView::ViewType viewType = JS_GetArrayBufferViewType(typedArray); - - MDefinition *ptr = convertShiftToMaskForStaticTypedArray(id, viewType); - if (!ptr) - return true; - - obj->setFoldedUnchecked(); - - // Clamp value to [0, 255] for Uint8ClampedArray. - MDefinition *toWrite = value; - if (viewType == ArrayBufferView::TYPE_UINT8_CLAMPED) { - toWrite = MClampToUint8::New(value); - current->add(toWrite->toInstruction()); - } - - MInstruction *store = MStoreTypedArrayElementStatic::New(typedArray, ptr, toWrite); - current->add(store); - current->push(value); - - *psucceeded = true; - return resumeAfter(store); + return true; } bool diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index 96ba2d4..02ba6d7 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -211,14 +211,16 @@ class AliasSet { FixedSlot = 1 << 3, // A member of obj->fixedSlots(). TypedArrayElement = 1 << 4, // A typed array element. DOMProperty = 1 << 5, // A DOM property - Last = DOMProperty, + TypedArrayLength = 1 << 6, // A typed array's length + Last = TypedArrayLength, Any = Last | (Last - 1), - NumCategories = 6, + NumCategories = 7, // Indicates load or store. Store_ = 1 << 31 }; + AliasSet(uint32_t flags) : flags_(flags) { @@ -4340,9 +4342,7 @@ class MTypedArrayLength return congruentIfOperandsEqual(ins); } AliasSet getAliasSet() const { - // The typed array |length| property is immutable, so there is no - // implicit dependency. - return AliasSet::None(); + return AliasSet::Load(AliasSet::TypedArrayLength); } }; diff --git a/js/src/js.msg b/js/src/js.msg index 4047035..05807e0 100644 --- a/js/src/js.msg +++ b/js/src/js.msg @@ -241,11 +241,11 @@ MSG_DEF(JSMSG_UNUSED187, 187, 0, JSEXN_NONE, "") MSG_DEF(JSMSG_INCOMPATIBLE_METHOD, 188, 3, JSEXN_TYPEERR, "{0} {1} called on incompatible {2}") MSG_DEF(JSMSG_UNUSED189, 189, 0, JSEXN_NONE, "") MSG_DEF(JSMSG_UNUSED190, 190, 0, JSEXN_NONE, "") -MSG_DEF(JSMSG_UNUSED191, 191, 0, JSEXN_NONE, "") +MSG_DEF(JSMSG_BAD_INDEX, 191, 0, JSEXN_RANGEERR, "invalid or out-of-range index") MSG_DEF(JSMSG_UNUSED192, 192, 0, JSEXN_NONE, "") MSG_DEF(JSMSG_BAD_FOR_EACH_LOOP, 193, 0, JSEXN_SYNTAXERR, "invalid for each loop") MSG_DEF(JSMSG_UNUSED194, 194, 0, JSEXN_NONE, "") -MSG_DEF(JSMSG_UNUSED195, 195, 0, JSEXN_NONE, "") +MSG_DEF(JSMSG_TYPE_ERR_BAD_ARGS, 195, 0, JSEXN_TYPEERR, "invalid arguments") MSG_DEF(JSMSG_UNUSED196, 196, 0, JSEXN_NONE, "") MSG_DEF(JSMSG_INTERNAL_INTL_ERROR, 197, 0, JSEXN_ERR, "internal error while computing Intl data") MSG_DEF(JSMSG_DEFAULT_LOCALE_ERROR, 198, 0, JSEXN_ERR, "internal error getting the default locale") diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h index d9840b1..da447a5 100644 --- a/js/src/jsfriendapi.h +++ b/js/src/jsfriendapi.h @@ -7,6 +7,8 @@ #ifndef jsfriendapi_h #define jsfriendapi_h +#include "mozilla/Casting.h" + #include "jsclass.h" #include "jspubtd.h" #include "jsprvtd.h" @@ -1289,6 +1291,93 @@ extern JS_FRIEND_API(JSBool) JS_IsFloat64Array(JSObject *obj); /* + * Test for specific typed array types (ArrayBufferView subtypes) and return + * the unwrapped object if so, else nullptr. Never throws. + */ + +namespace js { + +extern JS_FRIEND_API(JSObject *) +UnwrapInt8Array(JSObject *obj); +extern JS_FRIEND_API(JSObject *) +UnwrapUint8Array(JSObject *obj); +extern JS_FRIEND_API(JSObject *) +UnwrapUint8ClampedArray(JSObject *obj); +extern JS_FRIEND_API(JSObject *) +UnwrapInt16Array(JSObject *obj); +extern JS_FRIEND_API(JSObject *) +UnwrapUint16Array(JSObject *obj); +extern JS_FRIEND_API(JSObject *) +UnwrapInt32Array(JSObject *obj); +extern JS_FRIEND_API(JSObject *) +UnwrapUint32Array(JSObject *obj); +extern JS_FRIEND_API(JSObject *) +UnwrapFloat32Array(JSObject *obj); +extern JS_FRIEND_API(JSObject *) +UnwrapFloat64Array(JSObject *obj); + +extern JS_FRIEND_API(JSObject *) +UnwrapArrayBuffer(JSObject *obj); + +extern JS_FRIEND_API(JSObject *) +UnwrapArrayBufferView(JSObject *obj); + +namespace detail { + +extern JS_FRIEND_DATA(const Class* const) Int8ArrayClassPtr; +extern JS_FRIEND_DATA(const Class* const) Uint8ArrayClassPtr; +extern JS_FRIEND_DATA(const Class* const) Uint8ClampedArrayClassPtr; +extern JS_FRIEND_DATA(const Class* const) Int16ArrayClassPtr; +extern JS_FRIEND_DATA(const Class* const) Uint16ArrayClassPtr; +extern JS_FRIEND_DATA(const Class* const) Int32ArrayClassPtr; +extern JS_FRIEND_DATA(const Class* const) Uint32ArrayClassPtr; +extern JS_FRIEND_DATA(const Class* const) Float32ArrayClassPtr; +extern JS_FRIEND_DATA(const Class* const) Float64ArrayClassPtr; + +const size_t TypedArrayLengthSlot = 5; + +} // namespace detail + +/* + * Test for specific typed array types (ArrayBufferView subtypes) and return + * the unwrapped object if so, else nullptr. Never throws. + */ + +#define JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Type, type) \ +inline void \ +Get ## Type ## ArrayLengthAndData(JSObject *obj, uint32_t *length, type **data) \ +{ \ + JS_ASSERT(GetObjectClass(obj) == detail::Type ## ArrayClassPtr); \ + const JS::Value &slot = GetReservedSlot(obj, detail::TypedArrayLengthSlot); \ + *length = mozilla::SafeCast<uint32_t>(slot.toInt32()); \ + *data = static_cast<type*>(GetObjectPrivate(obj)); \ +} + +JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Int8, int8_t) +JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Uint8, uint8_t) +JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Uint8Clamped, uint8_t) +JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Int16, int16_t) +JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Uint16, uint16_t) +JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Int32, int32_t) +JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Uint32, uint32_t) +JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Float32, float) +JS_DEFINE_DATA_AND_LENGTH_ACCESSOR(Float64, double) + +#undef JS_DEFINE_DATA_AND_LENGTH_ACCESSOR + +// This one isn't inlined because it's rather tricky (by dint of having to deal +// with a dozen-plus classes and varying slot layouts. +extern JS_FRIEND_API(void) +GetArrayBufferViewLengthAndData(JSObject *obj, uint32_t *length, uint8_t **data); + +// This one isn't inlined because there are a bunch of different ArrayBuffer +// classes that would have to be individually handled here. +extern JS_FRIEND_API(void) +GetArrayBufferLengthAndData(JSObject *obj, uint32_t *length, uint8_t **data); + +} // namespace js + +/* * Unwrap Typed arrays all at once. Return NULL without throwing if the object * cannot be viewed as the correct typed array, or the typed array object on * success, filling both outparameters. @@ -1446,6 +1535,28 @@ JS_GetArrayBufferViewData(JSObject *obj); extern JS_FRIEND_API(JSObject *) JS_GetArrayBufferViewBuffer(JSObject *obj); +typedef enum { + ChangeData, + KeepData +} NeuterDataDisposition; + +namespace js { + +/* + * Set an ArrayBuffer's length to 0 and neuter all of its views. + * + * The |changeData| argument is a hint to inform internal behavior with respect + * to the internal pointer to the ArrayBuffer's data after being neutered. + * There is no guarantee it will be respected. But if it is respected, the + * ArrayBuffer's internal data pointer will, or will not, have changed + * accordingly. + */ +extern JS_FRIEND_API(bool) +NeuterArrayBuffer(JSContext *cx, JS::HandleObject obj, + NeuterDataDisposition changeData); + +} /* namespace js */ + /* * Check whether obj supports JS_GetDataView* APIs. */ diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp index 9d02d06..a78edd4 100644 --- a/js/src/jstypedarray.cpp +++ b/js/src/jstypedarray.cpp @@ -577,9 +577,12 @@ JSObject * ArrayBufferObject::createSlice(JSContext *cx, ArrayBufferObject &arrayBuffer, uint32_t begin, uint32_t end) { - JS_ASSERT(begin <= arrayBuffer.byteLength()); - JS_ASSERT(end <= arrayBuffer.byteLength()); - JS_ASSERT(begin <= end); + uint32_t bufLength = arrayBuffer.byteLength(); + if (begin > bufLength || end > bufLength || begin > end) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_TYPE_ERR_BAD_ARGS); + return NULL; + } + uint32_t length = end - begin; if (arrayBuffer.hasData()) @@ -620,8 +623,8 @@ ArrayBufferObject::createDataViewForThis(JSContext *cx, unsigned argc, Value *vp } bool -ArrayBufferObject::stealContents(JSContext *cx, JSObject *obj, void **contents, - uint8_t **data) +ArrayBufferObject::stealContents(JSContext *cx, JSObject *obj, NeuterDataDisposition changeData, + void **contents, uint8_t **data) { MOZ_ASSERT(cx); @@ -635,7 +638,7 @@ ArrayBufferObject::stealContents(JSContext *cx, JSObject *obj, void **contents, // If the ArrayBuffer's elements are transferrable, transfer ownership // directly. Otherwise we have to copy the data into new elements. - bool stolen = buffer.hasStealableContents(); + bool stolen = buffer.hasStealableContents() && changeData == ChangeData; if (stolen) { newHeader = AllocateArrayBufferContents(cx, byteLen, NULL); if (!newHeader) @@ -1190,13 +1193,15 @@ js::IsDataView(JSObject* obj) } void -TypedArray::neuter(JSObject *tarray) +TypedArray::neuter(JSObject *view) { - JS_ASSERT(tarray->isTypedArray()); - tarray->setSlot(LENGTH_SLOT, Int32Value(0)); - tarray->setSlot(BYTELENGTH_SLOT, Int32Value(0)); - tarray->setSlot(BYTEOFFSET_SLOT, Int32Value(0)); - tarray->setPrivate(NULL); + if (view->isTypedArray()) + view->setSlot(LENGTH_SLOT, Int32Value(0)); + else + MOZ_ASSERT(view->hasClass(&DataViewObject::class_)); + view->setSlot(BYTELENGTH_SLOT, Int32Value(0)); + view->setSlot(BYTEOFFSET_SLOT, Int32Value(0)); + view->setPrivate(NULL); } JSBool @@ -2023,20 +2028,26 @@ class TypedArrayTemplate uint32_t srcEnd; uint32_t dest; - uint32_t length = TypedArray::length(tarray); - if (!ToClampedIndex(cx, args[0], length, &srcBegin) || - !ToClampedIndex(cx, args[1], length, &srcEnd) || - !ToClampedIndex(cx, args[2], length, &dest) || + uint32_t originalLength = TypedArray::length(tarray); + if (!ToClampedIndex(cx, args[0], originalLength, &srcBegin) || + !ToClampedIndex(cx, args[1], originalLength, &srcEnd) || + !ToClampedIndex(cx, args[2], originalLength, &dest) || srcBegin > srcEnd) { - JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_TYPED_ARRAY_BAD_ARGS); return false; } + if (srcBegin > srcEnd) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_INDEX); + return false; + } + + uint32_t lengthDuringMove = TypedArray::length(tarray); // beware ToClampedIndex uint32_t nelts = srcEnd - srcBegin; - JS_ASSERT(dest + nelts >= dest); - if (dest + nelts > length) { + MOZ_ASSERT(dest <= INT32_MAX, "size limited to 2**31"); + MOZ_ASSERT(nelts <= INT32_MAX, "size limited to 2**31"); + if (dest + nelts > lengthDuringMove || srcEnd > lengthDuringMove) { JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_TYPED_ARRAY_BAD_ARGS); return false; } @@ -2114,8 +2125,7 @@ class TypedArrayTemplate if (!GetLengthProperty(cx, arg0, &len)) return false; - // avoid overflow; we know that offset <= length - if (len > length(tarray) - offset) { + if (uint32_t(offset) > length(tarray) || len > length(tarray) - offset) { JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_ARRAY_LENGTH); return false; } @@ -2268,7 +2278,8 @@ class TypedArrayTemplate static const NativeType getIndex(JSObject *obj, uint32_t index) { - return *(static_cast<const NativeType*>(viewData(obj)) + index); + MOZ_ASSERT(index < length(obj)); + return static_cast<const NativeType*>(viewData(obj))[index]; } static void @@ -2284,13 +2295,14 @@ class TypedArrayTemplate { JS_ASSERT(tarray); - JS_ASSERT(begin <= length(tarray)); - JS_ASSERT(end <= length(tarray)); + if (begin > length(tarray) || end > length(tarray) || begin > end) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_BAD_INDEX); + return NULL; + } RootedObject bufobj(cx, buffer(tarray)); JS_ASSERT(bufobj); - JS_ASSERT(begin <= end); uint32_t length = end - begin; JS_ASSERT(begin < UINT32_MAX / sizeof(NativeType)); @@ -2505,53 +2517,54 @@ class TypedArrayTemplate return false; js_memcpy(srcbuf, viewData(tarray), byteLength); + uint32_t len = length(tarray); switch (type(tarray)) { case TypedArray::TYPE_INT8: { int8_t *src = (int8_t*) srcbuf; - for (unsigned i = 0; i < length(tarray); ++i) + for (unsigned i = 0; i < len; ++i) *dest++ = NativeType(*src++); break; } case TypedArray::TYPE_UINT8: case TypedArray::TYPE_UINT8_CLAMPED: { uint8_t *src = (uint8_t*) srcbuf; - for (unsigned i = 0; i < length(tarray); ++i) + for (unsigned i = 0; i < len; ++i) *dest++ = NativeType(*src++); break; } case TypedArray::TYPE_INT16: { int16_t *src = (int16_t*) srcbuf; - for (unsigned i = 0; i < length(tarray); ++i) + for (unsigned i = 0; i < len; ++i) *dest++ = NativeType(*src++); break; } case TypedArray::TYPE_UINT16: { uint16_t *src = (uint16_t*) srcbuf; - for (unsigned i = 0; i < length(tarray); ++i) + for (unsigned i = 0; i < len; ++i) *dest++ = NativeType(*src++); break; } case TypedArray::TYPE_INT32: { int32_t *src = (int32_t*) srcbuf; - for (unsigned i = 0; i < length(tarray); ++i) + for (unsigned i = 0; i < len; ++i) *dest++ = NativeType(*src++); break; } case TypedArray::TYPE_UINT32: { uint32_t *src = (uint32_t*) srcbuf; - for (unsigned i = 0; i < length(tarray); ++i) + for (unsigned i = 0; i < len; ++i) *dest++ = NativeType(*src++); break; } case TypedArray::TYPE_FLOAT32: { float *src = (float*) srcbuf; - for (unsigned i = 0; i < length(tarray); ++i) + for (unsigned i = 0; i < len; ++i) *dest++ = NativeType(*src++); break; } case TypedArray::TYPE_FLOAT64: { double *src = (double*) srcbuf; - for (unsigned i = 0; i < length(tarray); ++i) + for (unsigned i = 0; i < len; ++i) *dest++ = NativeType(*src++); break; } @@ -2822,21 +2835,17 @@ DataViewObject::class_constructor(JSContext *cx, unsigned argc, Value *vp) return construct(cx, bufobj, args, NullPtr()); } -/* static */ bool -DataViewObject::getDataPointer(JSContext *cx, Handle<DataViewObject*> obj, - CallArgs args, size_t typeSize, uint8_t **data) +template <typename NativeType> +/* static */ uint8_t * +DataViewObject::getDataPointer(JSContext *cx, Handle<DataViewObject*> obj, uint32_t offset) { - uint32_t offset; - JS_ASSERT(args.length() > 0); - if (!ToUint32(cx, args[0], &offset)) - return false; - if (offset > UINT32_MAX - typeSize || offset + typeSize > obj->byteLength()) { + const size_t TypeSize = sizeof(NativeType); + if (offset > UINT32_MAX - TypeSize || offset + TypeSize > obj->byteLength()) { JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_ARG_INDEX_OUT_OF_RANGE, "1"); - return false; + return NULL; } - *data = static_cast<uint8_t*>(obj->dataPointer()) + offset; - return true; + return static_cast<uint8_t*>(obj->dataPointer()) + offset; } static inline bool @@ -2924,11 +2933,17 @@ DataViewObject::read(JSContext *cx, Handle<DataViewObject*> obj, return false; } - uint8_t *data; - if (!getDataPointer(cx, obj, args, sizeof(NativeType), &data)) + uint32_t offset; + if (!ToUint32(cx, args[0], &offset)) return false; bool fromLittleEndian = args.length() >= 2 && ToBoolean(args[1]); + + uint8_t *data = DataViewObject::getDataPointer<NativeType>(cx, obj, offset); + SkipRoot skipData(cx, &data); + if (!data) + return false; + DataViewIO<NativeType>::fromBuffer(val, data, needToSwapBytes(fromLittleEndian)); return true; } @@ -2976,9 +2991,8 @@ DataViewObject::write(JSContext *cx, Handle<DataViewObject*> obj, return false; } - uint8_t *data; - SkipRoot skipData(cx, &data); - if (!getDataPointer(cx, obj, args, sizeof(NativeType), &data)) + uint32_t offset; + if (!ToUint32(cx, args[0], &offset)) return false; NativeType value; @@ -2986,6 +3000,12 @@ DataViewObject::write(JSContext *cx, Handle<DataViewObject*> obj, return false; bool toLittleEndian = args.length() >= 3 && ToBoolean(args[2]); + + uint8_t *data = DataViewObject::getDataPointer<NativeType>(cx, obj, offset); + SkipRoot skipData(cx, &data); + if (!data) + return false; + DataViewIO<NativeType>::toBuffer(data, &value, needToSwapBytes(toLittleEndian)); return true; } @@ -3449,7 +3469,19 @@ const JSFunctionSpec _typedArray::jsfuncs[] = { \ return false; \ Class *clasp = obj->getClass(); \ return (clasp == &TypedArray::classes[TypedArrayTemplate<NativeType>::ArrayTypeID()]); \ - } + } \ + JS_FRIEND_API(JSObject *) js::Unwrap ## Name ## Array(JSObject *obj) \ + { \ + obj = CheckedUnwrap(obj); \ + if (!obj) \ + return NULL; \ + const Class *clasp = obj->getClass(); \ + if (clasp == &TypedArray::classes[TypedArrayTemplate<NativeType>::ArrayTypeID()]) \ + return obj; \ + return NULL; \ + } \ + JS_FRIEND_DATA(const js::Class* const) js::detail::Name ## ArrayClassPtr = \ + &js::TypedArray::classes[TypedArrayTemplate<NativeType>::ArrayTypeID()]; IMPL_TYPED_ARRAY_JSAPI_CONSTRUCTORS(Int8, int8_t) IMPL_TYPED_ARRAY_JSAPI_CONSTRUCTORS(Uint8, uint8_t) @@ -3918,6 +3950,14 @@ JS_IsArrayBufferObject(JSObject *obj) return obj ? obj->is<ArrayBufferObject>() : false; } +JS_FRIEND_API(JSObject *) +js::UnwrapArrayBuffer(JSObject *obj) +{ + if (JSObject *unwrapped = CheckedUnwrap(obj)) + return unwrapped->is<ArrayBufferObject>() ? unwrapped : NULL; + return NULL; +} + JS_FRIEND_API(JSBool) JS_IsTypedArrayObject(JSObject *obj) { @@ -3932,6 +3972,16 @@ JS_IsArrayBufferViewObject(JSObject *obj) return obj ? (obj->isTypedArray() || obj->is<DataViewObject>()) : false; } +JS_FRIEND_API(JSObject *) +js::UnwrapArrayBufferView(JSObject *obj) +{ + if (JSObject *unwrapped = CheckedUnwrap(obj)) { + if (unwrapped->isTypedArray() || unwrapped->is<DataViewObject>()) + return unwrapped; + } + return NULL; +} + JS_FRIEND_API(uint32_t) JS_GetArrayBufferByteLength(JSObject *obj) { @@ -3951,6 +4001,24 @@ JS_GetArrayBufferData(JSObject *obj) return buffer.dataPointer(); } +JS_FRIEND_API(bool) +js::NeuterArrayBuffer(JSContext *cx, HandleObject obj, + NeuterDataDisposition changeData) +{ + if (!obj->is<ArrayBufferObject>()) { + JS_ReportError(cx, "ArrayBuffer object required"); + return false; + } + + void *contents; + uint8_t *data; + if (!ArrayBufferObject::stealContents(cx, obj, changeData, &contents, &data)) + return false; + + JS_free(cx, contents); + return true; +} + JS_FRIEND_API(JSObject *) JS_NewArrayBuffer(JSContext *cx, uint32_t nbytes) { @@ -4010,7 +4078,7 @@ JS_StealArrayBufferContents(JSContext *cx, JSObject *obj, void **contents, return false; } - if (!ArrayBufferObject::stealContents(cx, obj, contents, data)) + if (!ArrayBufferObject::stealContents(cx, obj, ChangeData, contents, data)) return false; return true; @@ -4229,6 +4297,18 @@ JS_GetArrayBufferViewByteLength(JSObject *obj) : TypedArray::byteLengthValue(obj).toInt32(); } +JS_FRIEND_API(void) +js::GetArrayBufferViewLengthAndData(JSObject *obj, uint32_t *length, uint8_t **data) +{ + MOZ_ASSERT(obj->is<DataViewObject>() || obj->isTypedArray()); + + *length = obj->is<DataViewObject>() + ? obj->as<DataViewObject>().byteLength() + : TypedArray::byteLength(obj); + + *data = static_cast<uint8_t*>(obj->getPrivate()); +} + JS_FRIEND_API(JSObject *) JS_GetObjectAsArrayBufferView(JSObject *obj, uint32_t *length, uint8_t **data) { @@ -4259,3 +4339,11 @@ JS_GetObjectAsArrayBuffer(JSObject *obj, uint32_t *length, uint8_t **data) return obj; } + +JS_FRIEND_API(void) +js::GetArrayBufferLengthAndData(JSObject *obj, uint32_t *length, uint8_t **data) +{ + MOZ_ASSERT(obj->is<ArrayBufferObject>()); + *length = obj->as<ArrayBufferObject>().byteLength(); + *data = obj->as<ArrayBufferObject>().dataPointer(); +} diff --git a/js/src/jstypedarray.h b/js/src/jstypedarray.h index 4751d53..07d7f80 100644 --- a/js/src/jstypedarray.h +++ b/js/src/jstypedarray.h @@ -9,6 +9,7 @@ #include "jsapi.h" #include "jsclass.h" +#include "jsfriendapi.h" #include "jsobj.h" #include "gc/Barrier.h" @@ -155,8 +156,8 @@ class ArrayBufferObject : public JSObject return !isNeutered(); } - static bool stealContents(JSContext *cx, JSObject *obj, void **contents, - uint8_t **data); + static bool stealContents(JSContext *cx, JSObject *obj, NeuterDataDisposition changeData, + void **contents, uint8_t **data); static inline void setElementsHeader(js::ObjectElements *header, uint32_t bytes); static inline uint32_t getElementsHeaderInitializedLength(const js::ObjectElements *header); @@ -308,7 +309,7 @@ struct TypedArray : public BufferView { public: static bool isArrayIndex(JSObject *obj, jsid id, uint32_t *ip = NULL); - static void neuter(JSObject *tarray); + static void neuter(JSObject *view); static inline uint32_t slotWidth(int atype); static inline int slotWidth(JSObject *obj); @@ -323,6 +324,9 @@ struct TypedArray : public BufferView { static int dataOffset(); }; +MOZ_STATIC_ASSERT(js::detail::TypedArrayLengthSlot == TypedArray::LENGTH_SLOT, + "bad inlined constant in jsfriendapi.h"); + inline bool IsTypedArrayClass(const Class *clasp) { @@ -376,6 +380,10 @@ private: static inline bool is(const Value &v); + template <typename NativeType> + static uint8_t * + getDataPointer(JSContext *cx, Handle<DataViewObject*> obj, uint32_t offset); + template<Value ValueGetter(DataViewObject &view)> static bool getterImpl(JSContext *cx, CallArgs args); @@ -459,8 +467,6 @@ private: inline void *dataPointer(); inline bool hasBuffer() const; static JSObject *initClass(JSContext *cx); - static bool getDataPointer(JSContext *cx, Handle<DataViewObject*> obj, - CallArgs args, size_t typeSize, uint8_t **data); template<typename NativeType> static bool read(JSContext *cx, Handle<DataViewObject*> obj, CallArgs &args, NativeType *val, const char *method); diff --git a/js/src/jstypedarrayinlines.h b/js/src/jstypedarrayinlines.h index f26e9cc..6c8bf75 100644 --- a/js/src/jstypedarrayinlines.h +++ b/js/src/jstypedarrayinlines.h @@ -129,6 +129,7 @@ inline void * TypedArray::viewData(JSObject *obj) { JS_ASSERT(obj->isTypedArray()); + // Keep synced with js::Get<Type>ArrayLengthAndData in jsfriendapi.h! return (void *)obj->getPrivate(DATA_SLOT); } @@ -222,6 +223,13 @@ DataViewObject::create(JSContext *cx, uint32_t byteOffset, uint32_t byteLength, RootedObject proto(cx, protoArg); RootedObject obj(cx); + // This is overflow-safe: 2 * INT32_MAX is still a valid uint32_t. + if (byteOffset + byteLength > arrayBuffer->byteLength()) { + JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, JSMSG_ARG_INDEX_OUT_OF_RANGE, "1"); + return nullptr; + + } + NewObjectKind newKind = DataViewNewObjectKind(cx, byteLength, proto); obj = NewBuiltinClassInstance(cx, &class_, newKind); if (!obj) diff --git a/netwerk/base/src/ArrayBufferInputStream.cpp b/netwerk/base/src/ArrayBufferInputStream.cpp index 0daa1c5..16322d9 100644 --- a/netwerk/base/src/ArrayBufferInputStream.cpp +++ b/netwerk/base/src/ArrayBufferInputStream.cpp @@ -88,6 +88,17 @@ ArrayBufferInputStream::ReadSegments(nsWriteSegmentFun writer, void *closure, } uint32_t remaining = mBufferLength - mPos; + if (!mArrayBuffer.isUndefined()) { + JSObject* buf = &mArrayBuffer.toObject(); + uint32_t byteLength = JS_GetArrayBufferByteLength(buf); + if (byteLength == 0 && remaining != 0) { + mClosed = true; + return NS_BASE_STREAM_CLOSED; + } + } else { + MOZ_ASSERT(remaining == 0, "stream inited incorrectly"); + } + if (!remaining) { *result = 0; return NS_OK; diff --git a/xpcom/io/nsBinaryStream.cpp b/xpcom/io/nsBinaryStream.cpp index 8c2cc23..24b6ab3 100644 --- a/xpcom/io/nsBinaryStream.cpp +++ b/xpcom/io/nsBinaryStream.cpp @@ -17,8 +17,15 @@ * @See nsIBinaryInputStream * @See nsIBinaryOutputStream */ +#include <algorithm> #include <string.h> + #include "nsBinaryStream.h" + +#include "mozilla/Endian.h" +#include "mozilla/PodOperations.h" +#include "mozilla/Scoped.h" + #include "nsCRT.h" #include "prlong.h" #include "nsString.h" @@ -26,11 +33,13 @@ #include "nsIClassInfo.h" #include "nsComponentManagerUtils.h" #include "nsIURI.h" // for NS_IURI_IID -#include "mozilla/Endian.h" #include "jsapi.h" #include "jsfriendapi.h" +using mozilla::PodCopy; +using mozilla::ScopedDeleteArray; + NS_IMPL_ISUPPORTS3(nsBinaryOutputStream, nsIObjectOutputStream, nsIBinaryOutputStream, nsIOutputStream) NS_IMETHODIMP @@ -720,22 +729,49 @@ nsBinaryInputStream::ReadArrayBuffer(uint32_t aLength, const JS::Value& aBuffer, return NS_ERROR_FAILURE; } JS::RootedObject buffer(cx, &aBuffer.toObject()); - if (!JS_IsArrayBufferObject(buffer) || - JS_GetArrayBufferByteLength(buffer) < aLength) { + if (!JS_IsArrayBufferObject(buffer)) { return NS_ERROR_FAILURE; } - uint8_t* data = JS_GetArrayBufferData(&aBuffer.toObject()); - if (!data) { + + uint32_t bufferLength = JS_GetArrayBufferByteLength(buffer); + if (bufferLength < aLength) { return NS_ERROR_FAILURE; } - uint32_t bytesRead; - nsresult rv = Read(reinterpret_cast<char*>(data), aLength, &bytesRead); - NS_ENSURE_SUCCESS(rv, rv); - if (bytesRead != aLength) { + char* data = reinterpret_cast<char*>(JS_GetArrayBufferData(buffer)); + if (!data) { return NS_ERROR_FAILURE; } - return NS_OK; + + uint32_t bufSize = std::min<uint32_t>(aLength, 4096); + ScopedDeleteArray<char> buf(new char[bufSize]); + + uint32_t remaining = aLength; + do { + // Read data into temporary buffer. + uint32_t bytesRead; + uint32_t amount = std::min(remaining, bufSize); + nsresult rv = Read(buf, amount, &bytesRead); + if (NS_FAILED(rv)) { + return rv; + } + MOZ_ASSERT(bytesRead <= amount); + + if (bytesRead == 0) { + break; + } + + // Copy data into actual buffer. + if (bufferLength != JS_GetArrayBufferByteLength(buffer)) { + return NS_ERROR_FAILURE; + } + PodCopy(data, buf.get(), bytesRead); + + remaining -= bytesRead; + data += bytesRead; + } while (remaining > 0); + + return remaining > 0 ? NS_ERROR_FAILURE : NS_OK; } NS_IMETHODIMP

1 0

[tor-browser/esr24] Bug 1054359 - Add is-object check to IonBuilder::makeCallHelper. r=efaust, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 7ea61dd2364ac3ce359b8cb64b8945a51be49875 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Mon Aug 18 12:03:55 2014 +0200 Bug 1054359 - Add is-object check to IonBuilder::makeCallHelper. r=efaust, a=abillings --- js/src/jit/IonBuilder.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index 2ceaf71..e0d3ef6 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -5005,6 +5005,7 @@ IonBuilder::makeCallHelper(HandleFunction target, CallInfo &callInfo, bool clone // MCall accordingly. types::StackTypeSet *thisTypes = thisArg->resultTypeSet(); if (thisTypes && + thisTypes->getKnownTypeTag() == JSVAL_TYPE_OBJECT && TestAreKnownDOMTypes(cx, thisTypes) && TestShouldDOMCall(cx, thisTypes, target, JSJitInfo::Method)) {

1 0

[tor-browser/esr24] Automated checkin: version bump for thunderbird 24.8.0 release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit e651de644886949450fbbbd895480685b0c924b1 Author: tbirdbld <none@none> Date: Wed Aug 27 14:35:31 2014 -0400 Automated checkin: version bump for thunderbird 24.8.0 release. DONTBUILD CLOSED TREE a=release --- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/milestone.txt b/config/milestone.txt index a9c67eb..6ca6791 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.8.0esrpre +24.8.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index a9c67eb..6ca6791 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.8.0esrpre +24.8.0

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-135 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit adf3e103cd0e755216398683bec6be66a7fe9029 Author: ffxbld <none@none> Date: Sat Aug 23 03:14:00 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-135 - a=blocklist-update --- browser/app/blocklist.xml | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index e2eeda0..f0ea80c 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1407886026000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1408662916000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -228,6 +228,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i698" id="{6b2a75c8-6e2e-4267-b955-43e25b54e575}"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i498" id="hoverst(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> </versionRange> @@ -1074,8 +1080,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i474" id="{906000a4-88d9-4d52-b209-7a772970d91f}"> - <versionRange minVersion="0" maxVersion="*" severity="3"> + <emItem blockID="i700" id="2bbadf1f-a5af-499f-9642-9942fcdb7c76(a)f05a14cc-8842-4eee-be17-744677a917ed.com"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> </prefs> @@ -1184,8 +1190,8 @@ <prefs> </prefs> </emItem> - <emItem blockID="i83" id="flash(a)adobee.com"> - <versionRange minVersion="0" maxVersion="*"> + <emItem blockID="i694" id="59D317DB041748fdB89B47E6F96058F3@jetpack"> + <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> <prefs> </prefs> @@ -1305,6 +1311,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i83" id="flash(a)adobee.com"> + <versionRange minVersion="0" maxVersion="*"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i566" id="{77BEC163-D389-42c1-91A4-C758846296A5}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1634,6 +1646,14 @@ <prefs> </prefs> </emItem> + <emItem blockID="i696" id="/^({fa95f577-07cb-4470-ac90-e843f5f83c52}|ffxtlbr(a)speedial\.com)$/"> + <versionRange minVersion="0" maxVersion="*" severity="1"> + </versionRange> + <prefs> + <pref>browser.startup.homepage</pref> + <pref>browser.search.defaultenginename</pref> + </prefs> + </emItem> <emItem blockID="i544" id="/^(93abedcf-8e3a-4d02-b761-d1441e437c09@243f129d-aee2-42c2-bcd1-48858e1c22fd\.com|9acfc440-ac2d-417a-a64c-f6f14653b712@09f9a966-9258-4b12-af32-da29bdcc28c5\.com|58ad0086-1cfb-48bb-8ad2-33a8905572bc@5715d2be-69b9-4930-8f7e-64bdeb961cfd\.com)$/"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange> @@ -1672,6 +1692,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i474" id="{906000a4-88d9-4d52-b209-7a772970d91f}"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i496" id="{ACAA314B-EEBA-48e4-AD47-84E31C44796C}"> <versionRange minVersion="0" maxVersion="*" severity="1"> </versionRange>

1 0

[tor-browser/esr24] Automated checkin: version bump for firefox 24.8.0esr release. DONTBUILD CLOSED TREE a=release
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 2d7ff8e2c2a5444b7c2bfd27aadd57f52cfb1315 Author: ffxbld <none@none> Date: Mon Aug 25 08:18:46 2014 -0400 Automated checkin: version bump for firefox 24.8.0esr release. DONTBUILD CLOSED TREE a=release --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 98b82b8..e237e78 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.7.0esrpre +24.8.0esrpre diff --git a/config/milestone.txt b/config/milestone.txt index 20c6f99..a9c67eb 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.7.0 +24.8.0esrpre diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 20c6f99..a9c67eb 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.7.0 +24.8.0esrpre

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-135 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit c0507450a166ac7b8f2fb529e9eeb91c132fe15c Author: ffxbld <none@none> Date: Sat Aug 23 03:13:58 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-135 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 10 +++++++ security/manager/boot/src/nsSTSPreloadList.inc | 30 +++++++++++++++++---- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 01e8365..39ae673 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -1,6 +1,8 @@ +accelerated.de: did not receive HSTS header admin.google.com: did not receive HSTS header adsfund.org: could not connect to host airbnb.com: did not receive HSTS header +ansdell.net: did not receive HSTS header api.lookout.com: could not connect to host api.mega.co.nz: could not connect to host api.recurly.com: did not receive HSTS header @@ -13,10 +15,12 @@ bassh.net: did not receive HSTS header bccx.com: could not connect to host betnet.fr: could not connect to host bigshinylock.minazo.net: could not connect to host +blog.lookout.com: did not receive HSTS header braintreegateway.com: did not receive HSTS header braintreepayments.com: did not receive HSTS header browserid.org: did not receive HSTS header business.medbank.com.mt: did not receive HSTS header +ca.gparent.org: could not connect to host carlolly.co.uk: did not receive HSTS header cert.se: max-age too low: 2628001 checkout.google.com: did not receive HSTS header @@ -52,6 +56,7 @@ gmail.com: did not receive HSTS header googlemail.com: did not receive HSTS header googleplex.com: could not connect to host goto.google.com: did not receive HSTS header +gparent.org: could not connect to host greplin.com: did not receive HSTS header groups.google.com: did not receive HSTS header hackerone-user-content.com: could not connect to host @@ -72,6 +77,10 @@ ledgerscope.net: did not receive HSTS header liberty.lavabit.com: could not connect to host lifeguard.aecom.com: did not receive HSTS header lists.mayfirst.org: did not receive HSTS header +loenshotel.de: could not connect to host +login.corp.google.com: max-age too low: 7776000 +logotype.se: did not receive HSTS header +m.gparent.org: could not connect to host mail.google.com: did not receive HSTS header market.android.com: did not receive HSTS header mobilethreat.net: could not connect to host @@ -123,6 +132,7 @@ sunshinepress.org: could not connect to host surfeasy.com: did not receive HSTS header talk.google.com: did not receive HSTS header talkgadget.google.com: did not receive HSTS header +tektoria.de: did not receive HSTS header translate.googleapis.com: did not receive HSTS header uprotect.it: could not connect to host wallet.google.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 7dfc5f6..5d3a4c7 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1419070103890000); +const PRTime gPreloadListExpirationTime = INT64_C(1419674876234000); class nsSTSPreload { @@ -18,7 +18,6 @@ class nsSTSPreload }; static const nsSTSPreload kSTSPreloadList[] = { - { "accelerated.de", true }, { "accounts.firefox.com", true }, { "accounts.google.com", true }, { "aclu.org", false }, @@ -38,6 +37,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "apn-einstellungen.de", true }, { "app.manilla.com", true }, { "app.recurly.com", false }, + { "app.simpletax.ca", false }, { "app.yinxiang.com", false }, { "archlinux.de", true }, { "arivo.com.br", true }, @@ -65,14 +65,17 @@ static const nsSTSPreload kSTSPreloadList[] = { { "blacklane.com", true }, { "blocksatz-medien.de", true }, { "blog.cyveillance.com", true }, + { "blog.gparent.org", false }, { "blog.linode.com", false }, - { "blog.lookout.com", false }, { "blog.torproject.org", false }, { "bohramt.de", true }, { "boxcryptor.com", true }, + { "brunosouza.org", true }, { "buddhistische-weisheiten.org", true }, + { "bugzil.la", true }, { "bugzilla.mozilla.org", true }, { "business.lookout.com", false }, + { "bytepark.de", true }, { "calyxinstitute.org", false }, { "carezone.com", false }, { "cartouche24.eu", true }, @@ -101,6 +104,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "cybershambles.com", true }, { "cybozu.com", true }, { "cyphertite.com", true }, + { "daphne.informatik.uni-freiburg.de", true }, { "data-abundance.com", true }, { "data.qld.gov.au", false }, { "datenkeks.de", true }, @@ -127,6 +131,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "entropia.de", false }, { "errors.zenpayroll.com", false }, { "espra.com", true }, + { "ethitter.com", true }, { "eurotramp.com", true }, { "explodie.org", true }, { "f-droid.org", true }, @@ -136,6 +141,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "feedbin.com", false }, { "ferienhaus-polchow-ruegen.de", true }, { "fiken.no", true }, + { "firemail.io", true }, { "fischer-its.com", true }, { "fj.simple.com", false }, { "flynn.io", true }, @@ -151,6 +157,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "giacomopelagatti.it", true }, { "globalcs.co.uk", true }, { "globuli-info.de", true }, + { "gmantra.org", true }, { "go.xero.com", false }, { "gocardless.com", true }, { "grc.com", false }, @@ -166,6 +173,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "hausverbrauch.de", true }, { "heha.co", true }, { "helichat.de", true }, + { "help.simpletax.ca", false }, { "helpium.de", true }, { "hex2013.com", true }, { "hoerbuecher-und-hoerspiele.de", true }, @@ -224,14 +232,16 @@ static const nsSTSPreload kSTSPreloadList[] = { { "login.persona.org", true }, { "login.sapo.pt", true }, { "login.xero.com", false }, - { "logotype.se", true }, { "lolicore.ch", true }, { "lookout.com", false }, + { "ludwig.im", true }, { "lumi.do", false }, { "luneta.nearbuysystems.com", false }, + { "mach-politik.ch", true }, { "mail.de", true }, { "mailbox.org", false }, { "makeyourlaws.org", true }, + { "malnex.de", true }, { "manage.zenpayroll.com", false }, { "manageprojects.com", true }, { "manager.linode.com", false }, @@ -258,6 +268,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mudcrab.us", true }, { "munich-rage.de", true }, { "musicgamegalaxy.de", true }, + { "mutantmonkey.sexy", true }, { "mwe.st", true }, { "my.onlime.ch", false }, { "my.xero.com", false }, @@ -267,6 +278,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "neilwynne.com", false }, { "netzbit.de", true }, { "netzpolitik.org", true }, + { "ng-security.com", true }, { "npw.net", true }, { "onedrive.com", true }, { "onedrive.live.com", false }, @@ -278,6 +290,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "p.linode.com", false }, { "packagist.org", false }, { "pajonzeck.de", true }, + { "palava.tv", true }, { "passport.yandex.by", false }, { "passport.yandex.com", false }, { "passport.yandex.com.tr", false }, @@ -310,6 +323,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "rad-route.de", true }, { "raiseyourflag.com", true }, { "redports.org", true }, + { "reedloden.com", true }, { "reserve-online.net", true }, { "reviews.anime.my", true }, { "riccy.org", true }, @@ -321,21 +335,25 @@ static const nsSTSPreload kSTSPreloadList[] = { { "romab.com", true }, { "rosenkeller.org", true }, { "roundcube.mayfirst.org", false }, + { "rws-vertriebsportal.de", true }, { "sakaki.anime.my", true }, { "salaervergleich.com", true }, { "sandbox.mydigipass.com", false }, { "schokokeks.org", false }, { "schwarzer.it", true }, { "scrambl.is", true }, + { "sdsl-speedtest.de", true }, { "securityheaders.com", true }, { "secuvera.de", true }, { "seifried.org", true }, + { "servethecity-karlsruhe.de", true }, { "sherbers.de", true }, { "shodan.io", true }, { "siammedia.co", true }, { "silentcircle.com", true }, { "simbolo.co.uk", false }, { "simple.com", false }, + { "simpletax.ca", false }, { "simplystudio.com", true }, { "skydrive.live.com", false }, { "sprueche-zum-valentinstag.de", true }, @@ -356,7 +374,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "surkatty.org", true }, { "tageau.com", true }, { "tatort-fanpage.de", true }, - { "tektoria.de", true }, { "tent.io", true }, { "texte-zur-taufe.de", true }, { "thepaymentscompany.com", true }, @@ -385,6 +402,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "tonex.nl", true }, { "torproject.org", false }, { "trauertexte.info", true }, + { "tunebitfm.de", true }, { "twitter.com", false }, { "ub3rk1tten.com", true }, { "ubertt.org", true }, @@ -404,6 +422,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "webmail.gigahost.dk", false }, { "webmail.onlime.ch", false }, { "webmail.schokokeks.org", false }, + { "websenat.de", true }, { "welches-kinderfahrrad.de", true }, { "wepay.com", false }, { "wf-bigsky-master.appspot.com", true }, @@ -464,5 +483,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "y-o-w.com", true }, { "z.ai", true }, { "zenpayroll.com", false }, + { "zeropush.com", true }, { "zotero.org", true }, };

1 0

[tor-browser/esr24] Bug 1037641 - Split SetDirectionFromChangedTextNode into TextNodeWillChangeDirection and TextNodeChangedDirection. r=ehsan, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 38dc93ccf1549b964930c50bbc3f55f2377b6e23 Author: Simon Montagu <smontagu(a)smontagu.org> Date: Wed Aug 6 12:02:59 2014 +0300 Bug 1037641 - Split SetDirectionFromChangedTextNode into TextNodeWillChangeDirection and TextNodeChangedDirection. r=ehsan, a=abillings --- content/base/public/DirectionalityUtils.h | 18 +++++++++++++----- content/base/src/DirectionalityUtils.cpp | 26 ++++++++++++++------------ content/base/src/nsGenericDOMDataNode.cpp | 10 +++++++--- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/content/base/public/DirectionalityUtils.h b/content/base/public/DirectionalityUtils.h index 85a7e78..4b1758c 100644 --- a/content/base/public/DirectionalityUtils.h +++ b/content/base/public/DirectionalityUtils.h @@ -79,12 +79,20 @@ void WalkDescendantsSetDirAuto(mozilla::dom::Element* aElement, void WalkDescendantsClearAncestorDirAuto(mozilla::dom::Element* aElement); /** - * When the contents of a text node have changed, deal with any elements whose - * directionality needs to change + * When the contents of a text node are about to change, retrieve the current + * directionality of the text + * + * @return whether the text node affects the directionality of any element + */ +bool TextNodeWillChangeDirection(nsIContent* aTextNode, Directionality* aOldDir, + uint32_t aOffset); + +/** + * After the contents of a text node have changed, change the directionality + * of any elements whose directionality is determined by that node */ -void SetDirectionFromChangedTextNode(nsIContent* aTextNode, uint32_t aOffset, - const PRUnichar* aBuffer, uint32_t aLength, - bool aNotify); +void TextNodeChangedDirection(nsIContent* aTextNode, Directionality aOldDir, + bool aNotify); /** * When a text node is appended to an element, find any ancestors with dir=auto diff --git a/content/base/src/DirectionalityUtils.cpp b/content/base/src/DirectionalityUtils.cpp index 9fa8a12..a689a19 100644 --- a/content/base/src/DirectionalityUtils.cpp +++ b/content/base/src/DirectionalityUtils.cpp @@ -316,6 +316,7 @@ GetDirectionFromText(const PRUnichar* aText, const uint32_t aLength, start < end && NS_IS_LOW_SURROGATE(*start)) { ch = SURROGATE_TO_UCS4(ch, *start++); + current++; } Directionality dir = GetDirectionFromChar(ch); @@ -822,26 +823,27 @@ void SetAncestorDirectionIfAuto(nsINode* aTextNode, Directionality aDir, } } -void -SetDirectionFromChangedTextNode(nsIContent* aTextNode, uint32_t aOffset, - const PRUnichar* aBuffer, uint32_t aLength, - bool aNotify) +bool +TextNodeWillChangeDirection(nsIContent* aTextNode, Directionality* aOldDir, + uint32_t aOffset) { if (!NodeAffectsDirAutoAncestor(aTextNode)) { nsTextNodeDirectionalityMap::EnsureMapIsClearFor(aTextNode); - return; + return false; } uint32_t firstStrong; - Directionality oldDir = GetDirectionFromText(aTextNode->GetText(), - &firstStrong); - if (aOffset > firstStrong) { - return; - } + *aOldDir = GetDirectionFromText(aTextNode->GetText(), &firstStrong); + return (aOffset <= firstStrong); +} - Directionality newDir = GetDirectionFromText(aBuffer, aLength); +void +TextNodeChangedDirection(nsIContent* aTextNode, Directionality aOldDir, + bool aNotify) +{ + Directionality newDir = GetDirectionFromText(aTextNode->GetText()); if (newDir == eDir_NotSet) { - if (oldDir != eDir_NotSet && aTextNode->HasTextNodeDirectionalityMap()) { + if (aOldDir != eDir_NotSet && aTextNode->HasTextNodeDirectionalityMap()) { // This node used to have a strong directional character but no // longer does. ResetTextNodeDirection() will re-resolve the // directionality of any elements whose directionality was diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/content/base/src/nsGenericDOMDataNode.cpp index 2efc6cd..69ee693 100644 --- a/content/base/src/nsGenericDOMDataNode.cpp +++ b/content/base/src/nsGenericDOMDataNode.cpp @@ -294,9 +294,9 @@ nsGenericDOMDataNode::SetTextInternal(uint32_t aOffset, uint32_t aCount, nsNodeUtils::CharacterDataWillChange(this, &info); } - if (NodeType() == nsIDOMNode::TEXT_NODE) { - SetDirectionFromChangedTextNode(this, aOffset, aBuffer, aLength, aNotify); - } + Directionality oldDir = eDir_NotSet; + bool dirAffectsAncestor = (NodeType() == nsIDOMNode::TEXT_NODE && + TextNodeWillChangeDirection(this, &oldDir, aOffset)); if (aOffset == 0 && endOffset == textLength) { // Replacing whole text or old text was empty. Don't bother to check for @@ -338,6 +338,10 @@ nsGenericDOMDataNode::SetTextInternal(uint32_t aOffset, uint32_t aCount, document->SetBidiEnabled(); } + if (dirAffectsAncestor) { + TextNodeChangedDirection(this, oldDir, aNotify); + } + // Notify observers if (aNotify) { CharacterDataChangeInfo info = {

1 0