Skip to content

Commit 8f334b5

Browse files
committed
Merge branch 'master' of github.com:miekg/dns
2 parents 6293844 + 1f066aa commit 8f334b5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Diff for: labels_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ func TestIsDomainName(t *testing.T) {
176176
"..": &ret{false, 1},
177177
"@.": &ret{true, 1},
178178
"www.example.com": &ret{true, 3},
179+
"www.e%ample.com": &ret{true, 3},
179180
"www.example.com.": &ret{true, 3},
180181
"mi\\k.nl.": &ret{true, 2},
181182
"mi\\k.nl": &ret{true, 2},

Diff for: msg.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1440,9 +1440,9 @@ func (dns *Msg) Unpack(msg []byte) (err error) {
14401440
return err
14411441
}
14421442
}
1443-
// If we have seen a TC bit being set, we return here, without
1444-
// an error, because technically it isn't an error. So we return
1445-
// without parsing, the potentially corrupt packet.
1443+
// If we see a TC bit being set we return here, without
1444+
// an error, because technically it isn't an error. So return
1445+
// without parsing the potentially corrupt packet and hitting an error.
14461446
if dns.Truncated {
14471447
dns.Answer = nil
14481448
dns.Ns = nil

0 commit comments

Comments
 (0)