diff options
author | Brad Fitzpatrick <bradfitz@golang.org> | 2014-06-03 11:44:17 +0900 |
---|---|---|
committer | Brad Fitzpatrick <bradfitz@golang.org> | 2014-06-03 11:44:17 +0900 |
commit | 31ebc49585e862681032e9805d232718cd2bb558 (patch) | |
tree | 8c9397696dcea8b66594edfb9b550fce3750b9ec /src/pkg/time | |
parent | c27d2fa62da5e44c4bb4d3a1431b343b5ac20630 (diff) | |
download | go-31ebc49585e862681032e9805d232718cd2bb558.tar.gz |
time: support version 3 zone records
Fixes Issue 8134
LGTM=iant
R=golang-codereviews, iant
CC=golang-codereviews, r, rsc
https://codereview.appspot.com/100930044
Diffstat (limited to 'src/pkg/time')
-rw-r--r-- | src/pkg/time/zoneinfo_read.go | 4 | ||||
-rw-r--r-- | src/pkg/time/zoneinfo_test.go | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/pkg/time/zoneinfo_read.go b/src/pkg/time/zoneinfo_read.go index 4bb4bf665..de9ebb41c 100644 --- a/src/pkg/time/zoneinfo_read.go +++ b/src/pkg/time/zoneinfo_read.go @@ -68,7 +68,7 @@ func loadZoneData(bytes []byte) (l *Location, err error) { // 1-byte version, then 15 bytes of padding var p []byte - if p = d.read(16); len(p) != 16 || p[0] != 0 && p[0] != '2' { + if p = d.read(16); len(p) != 16 || p[0] != 0 && p[0] != '2' && p[0] != '3' { return nil, badData } @@ -123,7 +123,7 @@ func loadZoneData(bytes []byte) (l *Location, err error) { return nil, badData } - // If version == 2, the entire file repeats, this time using + // If version == 2 or 3, the entire file repeats, this time using // 8-byte ints for txtimes and leap seconds. // We won't need those until 2106. diff --git a/src/pkg/time/zoneinfo_test.go b/src/pkg/time/zoneinfo_test.go index 4653babc2..4ca7fad93 100644 --- a/src/pkg/time/zoneinfo_test.go +++ b/src/pkg/time/zoneinfo_test.go @@ -9,6 +9,15 @@ import ( "time" ) +func TestVersion3(t *testing.T) { + time.ForceZipFileForTesting(true) + defer time.ForceZipFileForTesting(false) + _, err := time.LoadLocation("Asia/Jerusalem") + if err != nil { + t.Fatal(err) + } +} + // Test that we get the correct results for times before the first // transition time. To do this we explicitly check early dates in a // couple of specific timezones. |