From 22dafc9bc5c8b339628a64c9f786491a60031005 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 14 Dec 2011 11:20:21 -0800 Subject: [PATCH] http: fix failing Transport HEAD request with gzip-looking response We only want to attempt to un-gzip if there's a body (not in response to a HEAD) This was accidentally passing before, but revealed to be broken when c3c6e72d7cc went in. R=golang-dev, rsc CC=golang-dev https://golang.org/cl/5477093 --- src/pkg/net/http/transport.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pkg/net/http/transport.go b/src/pkg/net/http/transport.go index dc70be43f2d..33ad32861b5 100644 --- a/src/pkg/net/http/transport.go +++ b/src/pkg/net/http/transport.go @@ -539,12 +539,13 @@ func (pc *persistConn) readLoop() { resp, err := ReadResponse(pc.br, rc.req) if err == nil { - if rc.addedGzip && resp.Header.Get("Content-Encoding") == "gzip" { + hasBody := rc.req.Method != "HEAD" && resp.ContentLength != 0 + if rc.addedGzip && hasBody && resp.Header.Get("Content-Encoding") == "gzip" { resp.Header.Del("Content-Encoding") resp.Header.Del("Content-Length") resp.ContentLength = -1 gzReader, zerr := gzip.NewReader(resp.Body) - if err != nil { + if zerr != nil { pc.close() err = zerr } else {