qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 09:14:43 -07:00
Code Releases Activity

net: don't forget about ongoing DNS lookup if context canceled

Browse Source 
Only forget about it if the context timed out, as the comment says.

Fixes #20703.

Change-Id: Ie6234f1a32f85e6bfd052dc24a33aa63b8883c37
Reviewed-on: https://go-review.googlesource.com/45999
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Ian Lance Taylor 2017-06-16 11:48:09 -07:00
parent 5ee4858a4c
commit ec7c6c16e1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/net/lookup.go
View File

@ -185,12 +185,15 @@ func (r *Resolver) LookupIPAddr(ctx context.Context, host string) ([]IPAddr, err
select { select {
case <-ctx.Done(): case <-ctx.Done():
// The DNS lookup timed out for some reason. Force // If the DNS lookup timed out for some reason, force
// future requests to start the DNS lookup again // future requests to start the DNS lookup again
// rather than waiting for the current lookup to // rather than waiting for the current lookup to
// complete. See issue 8602. // complete. See issue 8602.
err := mapErr(ctx.Err()) ctxErr := ctx.Err()
lookupGroup.Forget(host) if ctxErr == context.DeadlineExceeded {
lookupGroup.Forget(host)
}
err := mapErr(ctxErr)
if trace != nil && trace.DNSDone != nil { if trace != nil && trace.DNSDone != nil {
trace.DNSDone(nil, false, err) trace.DNSDone(nil, false, err)
} }