Bug 910095 - update .sv and .om in PSL, and relevant test. r=gerv.
authorSimone Carletti <weppos@weppos.net>
Tue, 17 Sep 2013 17:51:49 +0100
changeset 161350 4edf3871655073621d399f9929c3058da685114a
parent 161349 7a7d09fb4abac596930bd371828db9788cfb74c0
child 161351 06c405ba54b3ea940e701ff36bdf80701a2649e2
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv
bugs910095
milestone27.0a1
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
Bug 910095 - update .sv and .om in PSL, and relevant test. r=gerv.
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
@@ -5032,17 +5032,26 @@ com.nr
 
 // nu : http://en.wikipedia.org/wiki/.nu
 nu
 
 // nz : http://en.wikipedia.org/wiki/.nz
 *.nz
 
 // om : http://en.wikipedia.org/wiki/.om
-*.om
+om
+co.om
+com.om
+edu.om
+gov.om
+med.om
+museum.om
+net.om
+org.om
+pro.om
 !mediaphone.om
 !nawrastelecom.om
 !nawras.om
 !omanmobile.om
 !omanpost.om
 !omantel.om
 !rakpetroleum.om
 !siemens.om
@@ -5736,18 +5745,23 @@ net.st
 org.st
 principe.st
 saotome.st
 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@openregistry.com> 2012-05-31
 sx
 gov.sx
 
 // sy : http://en.wikipedia.org/wiki/.sy
 // see also: http://www.gobin.info/domainname/sy.doc
--- a/netwerk/test/unit/data/test_psl.txt
+++ b/netwerk/test/unit/data/test_psl.txt
@@ -55,22 +55,22 @@ checkPublicSuffix('ide.kyoto.jp', null);
 checkPublicSuffix('b.ide.kyoto.jp', 'b.ide.kyoto.jp');
 checkPublicSuffix('a.b.ide.kyoto.jp', 'b.ide.kyoto.jp');
 checkPublicSuffix('c.kobe.jp', null);
 checkPublicSuffix('b.c.kobe.jp', 'b.c.kobe.jp');
 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');
 checkPublicSuffix('www.test.us', 'test.us');
 checkPublicSuffix('ak.us', null);
 checkPublicSuffix('test.ak.us', 'test.ak.us');
 checkPublicSuffix('www.test.ak.us', 'test.ak.us');
 checkPublicSuffix('k12.ak.us', null);