aboutsummaryrefslogtreecommitdiff
path: root/src/net/http/httputil/reverseproxy.go
diff options
context:
space:
mode:
authorSameer Ajmani <sameer@golang.org>2017-02-06 13:43:11 -0500
committerBrad Fitzpatrick <bradfitz@golang.org>2017-02-06 19:16:56 +0000
commitfdbae7d77ed1d365f1fd6735d234f7c277102f12 (patch)
tree8d71accd627282356e8e79e8dca404cee354a515 /src/net/http/httputil/reverseproxy.go
parent2ca5d105b00353d3f3aa4da023e405b0550117d0 (diff)
downloadgo-fdbae7d77ed1d365f1fd6735d234f7c277102f12.tar.gz
go-fdbae7d77ed1d365f1fd6735d234f7c277102f12.zip
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>
Diffstat (limited to 'src/net/http/httputil/reverseproxy.go')
-rw-r--r--src/net/http/httputil/reverseproxy.go2
1 files changed, 1 insertions, 1 deletions
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 {