Fixed missing Body.Close when doing some HTTP requests. It should improve some request issues.

Upstream-commit: 830c458fe761aca5ad2facec33b3d0798caab116
Component: engine
This commit is contained in:
Sam Alba
2013-06-03 12:14:57 -07:00
parent 97e782d8ec
commit a771e69314
2 changed files with 7 additions and 1 deletions
+6 -1
View File
@@ -64,6 +64,9 @@ func (r *Registry) LookupRemoteImage(imgId, registry string, authConfig *auth.Au
}
req.SetBasicAuth(authConfig.Username, authConfig.Password)
res, err := rt.RoundTrip(req)
if err == nil {
defer res.Body.Close()
}
return err == nil && res.StatusCode == 307
}
@@ -152,7 +155,9 @@ func (r *Registry) GetRemoteTags(registries []string, repository string, token [
}
req.Header.Set("Authorization", "Token "+strings.Join(token, ", "))
res, err := r.client.Do(req)
defer res.Body.Close()
if err == nil {
defer res.Body.Close()
}
utils.Debugf("Got status code %d from %s", res.StatusCode, endpoint)
if err != nil || (res.StatusCode != 200 && res.StatusCode != 404) {
continue
+1
View File
@@ -321,6 +321,7 @@ func (srv *Server) pullImage(r *registry.Registry, out io.Writer, imgId, endpoin
if err != nil {
return err
}
defer layer.Close()
if err := srv.runtime.graph.Register(utils.ProgressReader(layer, contentLength, out, sf.FormatProgress("Downloading", "%v/%v (%v)"), sf), false, img); err != nil {
return err
}