From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Fri, 17 Nov 2017 17:13:49 +0000 (+0000)
Subject: Revert "net: Forget lookups for canceled contexts"
X-Git-Tag: go1.10beta1~214
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ac8a70d20960bb8bda2b7523281b5b3f83334063;p=gostls13.git

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>
---

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)
diff --git a/src/net/lookup_test.go b/src/net/lookup_test.go
index 8a0212a3f4..68a7abe95d 100644
--- a/src/net/lookup_test.go
+++ b/src/net/lookup_test.go
@@ -739,25 +739,3 @@ func TestLookupNonLDH(t *testing.T) {
 		t.Fatalf("lookup error = %v, want %v", err, errNoSuchHost)
 	}
 }
-
-func TestLookupContextCancel(t *testing.T) {
-	if runtime.GOOS == "nacl" {
-		t.Skip("skip on NaCl")
-	}
-
-	ctx, ctxCancel := context.WithCancel(context.Background())
-	ctxCancel()
-
-	_, err := DefaultResolver.LookupIPAddr(ctx, "google.com")
-	if err != errCanceled {
-		testenv.SkipFlakyNet(t)
-		t.Fatalf("unexpected error: %q", err)
-	}
-
-	ctx = context.Background()
-
-	_, err = DefaultResolver.LookupIPAddr(ctx, "google.com")
-	if err != nil {
-		t.Fatalf("unexpected error: %q", err)
-	}
-}