Backout bug 632595, bug 638195, bug 638749 and bug 658084 due to oranges on xpcshell.
authorMounir Lamouri <mounir.lamouri@gmail.com>
Fri, 20 May 2011 16:54:30 +0200
changeset 69768 43986ef8f59415430d068e56012533c0041d62cd
parent 69755 b59363737df0b02dbde4cf7daa902a60bb8f755a
child 69769 93db303e4d0a398dcac8d01e43b1ee4b569514a1
push idunknown
push userunknown
push dateunknown
bugs632595, 638195, 638749, 658084
milestone6.0a1
Backout bug 632595, bug 638195, bug 638749 and bug 658084 due to oranges on xpcshell.
netwerk/dns/effective_tld_names.dat
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -427,39 +427,38 @@ edu.bo
 gov.bo
 gob.bo
 int.bo
 org.bo
 net.bo
 mil.bo
 tv.bo
 
-// br : http://registro.br/dominio/dpn.html
-// Updated by registry <fneves@registro.br> 2011-03-01
+// br : http://en.wikipedia.org/wiki/.br
+// http://registro.br/info/dpn.html
+// Confirmed by registry <fneves@registro.br> 2008-06-24
 br
 adm.br
 adv.br
 agr.br
 am.br
 arq.br
 art.br
 ato.br
-b.br
 bio.br
 blog.br
 bmd.br
 can.br
 cim.br
 cng.br
 cnt.br
 com.br
 coop.br
 ecn.br
 edu.br
-emp.br
 eng.br
 esp.br
 etc.br
 eti.br
 far.br
 flog.br
 fm.br
 fnd.br
@@ -484,22 +483,19 @@ not.br
 ntr.br
 odo.br
 org.br
 ppg.br
 pro.br
 psc.br
 psi.br
 qsl.br
-radio.br
 rec.br
 slg.br
 srv.br
-taxi.br
-teo.br
 tmp.br
 trd.br
 tur.br
 tv.br
 vet.br
 vlog.br
 wiki.br
 zlg.br
@@ -773,27 +769,17 @@ dk
 dm
 com.dm
 net.dm
 org.dm
 edu.dm
 gov.dm
 
 // do : http://en.wikipedia.org/wiki/.do
-do
-art.do
-com.do
-edu.do
-gob.do
-gov.do
-mil.do
-net.do
-org.do
-sld.do
-web.do
+*.do
 
 // dz : http://en.wikipedia.org/wiki/.dz
 dz
 com.dz
 org.dz
 net.dz
 gov.dz
 edu.dz
@@ -829,26 +815,17 @@ lib.ee
 med.ee
 com.ee
 pri.ee
 aip.ee
 org.ee
 fie.ee
 
 // eg : http://en.wikipedia.org/wiki/.eg
-eg  
-com.eg
-edu.eg
-eun.eg
-gov.eg
-mil.eg
-name.eg
-net.eg
-org.eg
-sci.eg
+*.eg
 
 // er : http://en.wikipedia.org/wiki/.er
 *.er
 
 // es : https://www.nic.es/site_ingles/ingles/dominios/index.html
 es
 com.es
 nom.es
@@ -4403,17 +4380,16 @@ or.ug
 !british-library.uk
 !icnet.uk
 !jet.uk
 !nel.uk
 !nhs.uk
 !nls.uk
 !national-library-scotland.uk
 !parliament.uk
-!police.uk
 
 // us : http://en.wikipedia.org/wiki/.us
 us
 dni.us
 fed.us
 isa.us
 kids.us
 nsn.us
@@ -4728,140 +4704,64 @@ edu.ws
 // <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 <.Zhonggou>) : CN 
 // CNNIC
 // http://cnnic.cn/html/Dir/2005/10/11/3218.htm
 中国
 
 // xn--fiqz9s ("China" Chinese-Han-Traditional <.Zhonggou>) : 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--fzc2c9e2c ("Lanka" Sinhalese-Sinhala) : LK
 // http://nic.lk
 ලංකා
 
 // xn--xkc2al3hye2a ("Ilangai" Tamil) : LK
 // http://nic.lk
 இலங்கை
 
-// xn--mgbc0a9azcg ("Morocco / al-Maghrib" Arabic) : MA  
-المغرب
-
-// xn--mgb9awbf ("Oman" Arabic) : OM  
-عمان
-
-// xn--mgbai9azgqp6j ("Pakistan" Arabic) : PK  
-‎‎پاکستان
-
-// xn--mgbai9a5eva00b ("Pakistan" Arabic) variant : PK  
-‎‎پاكستان
-
 // xn--ygbi2ammx ("Falasteen" Arabic) : PS
 // The Palestinian National Internet Naming Authority (PNINA)
 // http://www.pnina.ps
 فلسطين
 
-// xn--90a3ac ("srb" Cyrillic) : RS  
-срб
-
 // 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
@@ -4874,28 +4774,16 @@ edu.ws
 // 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
 
 // yu : http://www.nic.yu/pravilnik-e.html
 *.yu
 
 // za : http://www.zadna.org.za/slds.html
 *.za