From: Chris Manghane <cmang@golang.org>
Date: Tue, 2 May 2017 05:34:37 +0000 (-0400)
Subject: net/http: bgErr is unused; remove it
X-Git-Tag: go1.9beta1~357
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=48def43fd65388717c3edbdbbc3b3465ff9176ab;p=gostls13.git

net/http: bgErr is unused; remove it

Fixes #20196.

Change-Id: Ib87f6e9e27a38f21f860b7150c818d77be653dd3
Reviewed-on: https://go-review.googlesource.com/42370
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/net/http/server.go b/src/net/http/server.go
index 3cb490d8a7..838b95aaed 100644
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -623,7 +623,6 @@ type connReader struct {
 	mu      sync.Mutex // guards following
 	hasByte bool
 	byteBuf [1]byte
-	bgErr   error // non-nil means error happened on background read
 	cond    *sync.Cond
 	inRead  bool
 	aborted bool  // set true before conn.rwc deadline is set to past
@@ -732,11 +731,6 @@ func (cr *connReader) Read(p []byte) (n int, err error) {
 		cr.unlock()
 		return 0, io.EOF
 	}
-	if cr.bgErr != nil {
-		err = cr.bgErr
-		cr.unlock()
-		return 0, err
-	}
 	if len(p) == 0 {
 		cr.unlock()
 		return 0, nil