qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 17:44:40 -07:00
Code Releases Activity

http: close underlying gzip Reader too

Browse Source 
Fixes #1724

R=rsc
CC=golang-dev
https://golang.org/cl/4443056
This commit is contained in:
Brad Fitzpatrick 2011-04-21 16:01:29 -07:00
parent a1f5f3f109
commit 750b6c63f9
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pkg/http/transport.go
View File

@ -532,12 +532,12 @@ func (pc *persistConn) roundTrip(req *Request) (resp *Response, err os.Error) {
re.res.Header.Del("Content-Encoding")
re.res.Header.Del("Content-Length")
re.res.ContentLength = -1
var err os.Error
re.res.Body, err = gzip.NewReader(re.res.Body)
gzReader, err := gzip.NewReader(re.res.Body)
if err != nil {
pc.close()
return nil, err
}
re.res.Body = &readFirstCloseBoth{gzReader, re.res.Body}
}
return re.res, re.err
@ -606,3 +606,18 @@ func (es *bodyEOFSignal) Close() (err os.Error) {
}
return
}
type readFirstCloseBoth struct {
io.ReadCloser
io.Closer
}
func (r *readFirstCloseBoth) Close() os.Error {
if err := r.ReadCloser.Close(); err != nil {
return err
}
if err := r.Closer.Close(); err != nil {
return err
}
return nil
}