net/http: don't drop error on request write

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/7230059

diff --git a/src/pkg/net/http/transfer.go b/src/pkg/net/http/transfer.go
index 25b34addec77fe9b57af79cc22bafe134653af67..83b7ee7cb4091a9550e5da2dfb157adc11b90384 100644 (file)
--- a/src/pkg/net/http/transfer.go
+++ b/src/pkg/net/http/transfer.go
@@ -194,10 +194,11 @@ func (t *transferWriter) WriteBody(w io.Writer) (err error) {
                        ncopy, err = io.Copy(w, t.Body)
                } else {
                        ncopy, err = io.Copy(w, io.LimitReader(t.Body, t.ContentLength))
-                       nextra, err := io.Copy(ioutil.Discard, t.Body)
                        if err != nil {
                                return err
                        }
+                       var nextra int64
+                       nextra, err = io.Copy(ioutil.Discard, t.Body)
                        ncopy += nextra
                }
                if err != nil {