From: Sameer Ajmani <sameer@golang.org>
Date: Mon, 6 Feb 2017 18:43:11 +0000 (-0500)
Subject: net/http/httputil: don't log read error when it's context.Canceled
X-Git-Tag: go1.9beta1~1727
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=fdbae7d77ed1d365f1fd6735d234f7c277102f12;p=gostls13.git

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

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
index 60b94d7649..488db97313 100644
--- 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 {