Browse Source

publicsuffix: update table to latest list from publicsuffix.org.

Also update the comments to point to github.com/publicsuffix instead of
to hg.mozilla.org/mozilla-central.

Change-Id: I9bcbb387ba933dc4b79eff047b9e2e7113f34a42
Reviewed-on: https://go-review.googlesource.com/12161
Reviewed-by: Andrew Gerrand <adg@golang.org>
Nigel Tao 10 years ago
parent
commit
f0cf018861
4 changed files with 8384 additions and 7517 deletions
  1. 3 3
      publicsuffix/gen.go
  2. 5 5
      publicsuffix/list_test.go
  3. 8013 7498
      publicsuffix/table.go
  4. 363 11
      publicsuffix/table_test.go

+ 3 - 3
publicsuffix/gen.go

@@ -13,10 +13,10 @@ package main
 //	go run gen.go -version "xxx" -test >table_test.go
 //	go run gen.go -version "xxx" -test >table_test.go
 //
 //
 // The version is derived from information found at
 // The version is derived from information found at
-// https://hg.mozilla.org/mozilla-central/log/tip/netwerk/dns/effective_tld_names.dat
+// https://github.com/publicsuffix/list/commits/master/public_suffix_list.dat
 //
 //
-// To fetch a particular hg revision, such as 05b11a8d1ace, pass
-// -url "https://hg.mozilla.org/mozilla-central/raw-file/05b11a8d1ace/netwerk/dns/effective_tld_names.dat"
+// To fetch a particular git revision, such as 5c70ccd250, pass
+// -url "https://github.com/publicsuffix/list/blob/5c70ccd250/public_suffix_list.dat"
 
 
 import (
 import (
 	"bufio"
 	"bufio"

+ 5 - 5
publicsuffix/list_test.go

@@ -329,7 +329,7 @@ func (b byPriority) Less(i, j int) bool {
 }
 }
 
 
 // eTLDPlusOneTestCases come from
 // eTLDPlusOneTestCases come from
-// http://mxr.mozilla.org/mozilla-central/source/netwerk/test/unit/data/test_psl.txt
+// https://github.com/publicsuffix/list/blob/master/tests/test_psl.txt
 var eTLDPlusOneTestCases = []struct {
 var eTLDPlusOneTestCases = []struct {
 	domain, want string
 	domain, want string
 }{
 }{
@@ -356,10 +356,10 @@ var eTLDPlusOneTestCases = []struct {
 	{"a.b.example.uk.com", "example.uk.com"},
 	{"a.b.example.uk.com", "example.uk.com"},
 	{"test.ac", "test.ac"},
 	{"test.ac", "test.ac"},
 	// TLD with only 1 (wildcard) rule.
 	// TLD with only 1 (wildcard) rule.
-	{"cy", ""},
-	{"c.cy", ""},
-	{"b.c.cy", "b.c.cy"},
-	{"a.b.c.cy", "b.c.cy"},
+	{"il", ""},
+	{"c.il", ""},
+	{"b.c.il", "b.c.il"},
+	{"a.b.c.il", "b.c.il"},
 	// More complex TLD.
 	// More complex TLD.
 	{"jp", ""},
 	{"jp", ""},
 	{"test.jp", "test.jp"},
 	{"test.jp", "test.jp"},

File diff suppressed because it is too large
+ 8013 - 7498
publicsuffix/table.go


File diff suppressed because it is too large
+ 363 - 11
publicsuffix/table_test.go


Some files were not shown because too many files changed in this diff