net/http/httputil: don't log read error when it's context.Canceled

Sajmani · bradfitz · commit fdbae7d77ed1 · 2017-02-06T19:16:56.000Z
Fixes #18838 Change-Id: I44976cadb0dc3c23eacb8cdd58429a572cd8d28a Reviewed-on: https://go-review.googlesource.com/36358 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/src/net/http/httputil/reverseproxy.go b/src/net/http/httputil/reverseproxy.go
@@ -286,7 +286,7 @@ func (p *ReverseProxy) copyBuffer(dst io.Writer, src io.Reader, buf []byte) (int
 	var written int64
 	for {
 		nr, rerr := src.Read(buf)
-		if rerr != nil && rerr != io.EOF {
+		if rerr != nil && rerr != io.EOF && rerr != context.Canceled {
 			p.logf("httputil: ReverseProxy read error during body copy: %v", rerr)
 		}
 		if nr > 0 {

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ func (p *ReverseProxy) copyBuffer(dst io.Writer, src io.Reader, buf []byte) (int`
`286`	`286`	`var written int64`
`287`	`287`	`for {`
`288`	`288`	`nr, rerr := src.Read(buf)`
`289`		`- if rerr != nil && rerr != io.EOF {`
	`289`	`+ if rerr != nil && rerr != io.EOF && rerr != context.Canceled {`
`290`	`290`	`p.logf("httputil: ReverseProxy read error during body copy: %v", rerr)`
`291`	`291`	`}`
`292`	`292`	`if nr > 0 {`