ensure responses always have a body

This commit is contained in:
risk danger olson 2015-07-21 14:44:40 -06:00
parent 1180e5eaf9
commit bbf2d1654f
2 changed files with 9 additions and 9 deletions

@ -358,7 +358,15 @@ func UploadObject(o *objectResource, cb CopyCallback) *WrappedError {
}
func doHttpRequest(req *http.Request, creds Creds) (*http.Response, *WrappedError) {
res, err := DoHTTP(req)
res, err := Config.HttpClient().Do(req)
if res == nil {
res = &http.Response{
StatusCode: 0,
Header: make(http.Header),
Request: req,
Body: ioutil.NopCloser(bytes.NewBufferString("")),
}
}
var wErr *WrappedError

@ -98,14 +98,6 @@ func (c *HttpClient) Do(req *http.Request) (*http.Response, error) {
return res, err
}
func DoHTTP(req *http.Request) (*http.Response, error) {
res, err := Config.HttpClient().Do(req)
if res == nil {
res = &http.Response{StatusCode: 0, Header: make(http.Header), Request: req}
}
return res, err
}
func (c *Configuration) HttpClient() *HttpClient {
if c.httpClient != nil {
return c.httpClient