]> Cypherpunks repositories - gostls13.git/commitdiff
net/http/httputil: don't log read error when it's context.Canceled
authorSameer Ajmani <sameer@golang.org>
Mon, 6 Feb 2017 18:43:11 +0000 (13:43 -0500)
committerBrad Fitzpatrick <bradfitz@golang.org>
Mon, 6 Feb 2017 19:16:56 +0000 (19:16 +0000)
Fixes #18838

Change-Id: I44976cadb0dc3c23eacb8cdd58429a572cd8d28a
Reviewed-on: https://go-review.googlesource.com/36358
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/net/http/httputil/reverseproxy.go

index 60b94d764955964eb5400399e1c7e13b5b8ef569..488db9731330f3f4d8eac3e0f9554f8d36eeacab 100644 (file)
@@ -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 {