Backed out changeset 13c1b3a2d135 (bug 880625) for xpcshell failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 02 Dec 2013 13:07:46 -0500
changeset 173002 e5ca4a98aa68301b5b7b0830d7b5ee0ef9ebcf4b
parent 173001 27c14a1b1d4ca47172337cbd4962834ff3227486
child 173003 76e799f770699b76d8703b34e08e283fa0cfe87a
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs880625
milestone28.0a1
backs out13c1b3a2d135ff95fac2557f9bb5ac974784f2e3
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 13c1b3a2d135 (bug 880625) for xpcshell failures.
netwerk/dns/effective_tld_names.dat
netwerk/test/unit/data/test_psl.txt
--- a/netwerk/dns/effective_tld_names.dat
+++ b/netwerk/dns/effective_tld_names.dat
@@ -294,24 +294,17 @@ com.bb
 edu.bb
 gov.bb
 info.bb
 net.bb
 org.bb
 store.bb
 
 // bd : http://en.wikipedia.org/wiki/.bd
-bd
-ac.bd
-com.bd
-edu.bd
-gov.bd
-mil.bd
-net.bd
-org.bd
+*.bd
 
 // be : http://en.wikipedia.org/wiki/.be
 // Confirmed by registry <tech@dns.be> 2008-06-08
 be
 ac.be
 
 // bf : http://en.wikipedia.org/wiki/.bf
 bf
@@ -386,23 +379,18 @@ gouv.bj
 // bm : http://www.bermudanic.bm/dnr-text.txt
 bm
 com.bm
 edu.bm
 gov.bm
 net.bm
 org.bm
 
-// bn : http://whois.btcl.net.bd/faq_dotbd.php
-bn
-com.bn
-edu.bn
-gov.bn
-net.bn
-org.bn
+// bn : http://en.wikipedia.org/wiki/.bn
+*.bn
 
 // bo : http://www.nic.bo/
 bo
 com.bo
 edu.bo
 gov.bo
 gob.bo
 int.bo
@@ -589,25 +577,18 @@ go.ci
 asso.ci
 aƩroport.ci
 int.ci
 presse.ci
 md.ci
 gouv.ci
 
 // ck : http://en.wikipedia.org/wiki/.ck
-ck
-biz.ck
-co.ck
-edu.ck
-gen.ck
-gov.ck
-info.ck
-net.ck
-org.ck
+*.ck
+!www.ck
 
 // cl : http://en.wikipedia.org/wiki/.cl
 cl
 gov.cl
 gob.cl
 co.cl
 mil.cl
 
@@ -717,31 +698,18 @@ edu.cw
 net.cw
 org.cw
 
 // cx : http://en.wikipedia.org/wiki/.cx
 // list of other 2nd level tlds ?
 cx
 gov.cx
 
-// cy : http://www.nic.cy/rulesreg.htm
-cy
-ac.cy
-biz.cy
-com.cy
-ekloges.cy
-gov.cy
-ltd.cy
-name.cy
-net.cy
-org.cy
-parliament.cy
-press.cy
-pro.cy
-tm.cy
+// cy : http://en.wikipedia.org/wiki/.cy
+*.cy
 
 // cz : http://en.wikipedia.org/wiki/.cz
 cz
 
 // de : http://en.wikipedia.org/wiki/.de
 // Confirmed by registry <ops@denic.de> (with technical
 // reservations) 2008-07-01
 de
--- a/netwerk/test/unit/data/test_psl.txt
+++ b/netwerk/test/unit/data/test_psl.txt
@@ -33,20 +33,20 @@ checkPublicSuffix('example.com', 'exampl
 checkPublicSuffix('b.example.com', 'example.com');
 checkPublicSuffix('a.b.example.com', 'example.com');
 checkPublicSuffix('uk.com', null);
 checkPublicSuffix('example.uk.com', 'example.uk.com');
 checkPublicSuffix('b.example.uk.com', 'example.uk.com');
 checkPublicSuffix('a.b.example.uk.com', 'example.uk.com');
 checkPublicSuffix('test.ac', 'test.ac');
 // TLD with only 1 (wildcard) rule.
-checkPublicSuffix('il', null);
-checkPublicSuffix('c.il', null);
-checkPublicSuffix('b.c.il', 'b.c.il');
-checkPublicSuffix('a.b.c.il', 'b.c.il');
+checkPublicSuffix('cy', null);
+checkPublicSuffix('c.cy', null);
+checkPublicSuffix('b.c.cy', 'b.c.cy');
+checkPublicSuffix('a.b.c.cy', 'b.c.cy');
 // More complex TLD.
 checkPublicSuffix('jp', null);
 checkPublicSuffix('test.jp', 'test.jp');
 checkPublicSuffix('www.test.jp', 'test.jp');
 checkPublicSuffix('ac.jp', null);
 checkPublicSuffix('test.ac.jp', 'test.ac.jp');
 checkPublicSuffix('www.test.ac.jp', 'test.ac.jp');
 checkPublicSuffix('kyoto.jp', null);