Browse code

Fix write after close on http response

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

Derek McGowan authored on 2015/01/22 02:44:24
Showing 2 changed files
... ...
@@ -111,6 +111,7 @@ func (o *Output) Close() error {
111 111
 		}
112 112
 	}
113 113
 	o.tasks.Wait()
114
+	o.dests = nil
114 115
 	return firstErr
115 116
 }
116 117
 
... ...
@@ -226,7 +226,7 @@ func (r *Session) PutV2ImageBlob(ep *Endpoint, imageName, sumType, sumStr string
226 226
 
227 227
 	method := "PUT"
228 228
 	log.Debugf("[registry] Calling %q %s", method, location)
229
-	req, err = r.reqFactory.NewRequest(method, location, blobRdr)
229
+	req, err = r.reqFactory.NewRequest(method, location, ioutil.NopCloser(blobRdr))
230 230
 	if err != nil {
231 231
 		return err
232 232
 	}