From: Gustavo Niemeyer <gustavo@niemeyer.net>
Date: Thu, 28 Feb 2013 00:15:36 +0000 (-0300)
Subject: net/http: don't drop error on request write
X-Git-Tag: go1.1rc2~794
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=64648986e32ce8d3b1bfdab7fe255c3f69baa163;p=gostls13.git

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 25b34addec..83b7ee7cb4 100644
--- 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 {