From: Robert Griesemer <gri@golang.org>
Date: Wed, 14 Dec 2011 18:44:34 +0000 (-0800)
Subject: undo CL 5477092 / c3c6e72d7cc5
X-Git-Tag: weekly.2011-12-14~17
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=25e94154b719506511b16e0936dcea60846fa790;p=gostls13.git

undo CL 5477092 / c3c6e72d7cc5

The obvious fix is breaking the build in non-obvious ways.
Reverting while waiting for the correct fix, if any is needed.

««« original CL description
net/http: fix bug in error checking

Thanks to josef86@gmail.com for pointing this out.

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/5477092
»»»

R=iant
CC=golang-dev
https://golang.org/cl/5488085
---

diff --git a/src/pkg/net/http/transport.go b/src/pkg/net/http/transport.go
index 62d36d6986..dc70be43f2 100644
--- a/src/pkg/net/http/transport.go
+++ b/src/pkg/net/http/transport.go
@@ -544,7 +544,7 @@ func (pc *persistConn) readLoop() {
 				resp.Header.Del("Content-Length")
 				resp.ContentLength = -1
 				gzReader, zerr := gzip.NewReader(resp.Body)
-				if zerr != nil {
+				if err != nil {
 					pc.close()
 					err = zerr
 				} else {