diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2017-11-17 17:13:49 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2017-11-17 17:14:02 +0000 |
| commit | ac8a70d20960bb8bda2b7523281b5b3f83334063 (patch) | |
| tree | 067d8a30f2fd35b4e29942d58582be26def4543b /src/net/lookup.go | |
| parent | d2414cefbae4758ca48dd664b3a55e08eaaff755 (diff) | |
| download | go-ac8a70d20960bb8bda2b7523281b5b3f83334063.tar.gz go-ac8a70d20960bb8bda2b7523281b5b3f83334063.zip | |
Revert "net: Forget lookups for canceled contexts"
This reverts commit 6a3d4be3b80054b1d802b73d5a519e252e0f82ed.
Reason for revert: breaks various builds. See comments on CL 77670
Change-Id: Iaf3260319b560f49ace06af705a2114630f32063
Reviewed-on: https://go-review.googlesource.com/78515
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/net/lookup.go')
| -rw-r--r-- | src/net/lookup.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/lookup.go b/src/net/lookup.go index 607953bba5..c9f327050a 100644 --- a/src/net/lookup.go +++ b/src/net/lookup.go @@ -200,7 +200,7 @@ func (r *Resolver) LookupIPAddr(ctx context.Context, host string) ([]IPAddr, err // rather than waiting for the current lookup to // complete. See issue 8602. ctxErr := ctx.Err() - if ctxErr == context.Canceled || ctxErr == context.DeadlineExceeded { + if ctxErr == context.DeadlineExceeded { lookupGroup.Forget(host) } err := mapErr(ctxErr) |