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 62d36d698622f46a73bd681b4355c909882b0e81..dc70be43f2d7bb48c1bb0a4eeccd14edd1fd2a24 100644 (file)
--- 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 {