docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1078 from kstaken/fix_json_error 

* Remote API: Small fix in /start if empty host config
This commit is contained in:
Victor Vieux 2013-07-01 16:36:58 -07:00
parent ead9cefadb d8d33e8b8b
commit d1d66b9c5f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api.go
View File

@ -555,8 +555,10 @@ func postContainersStart(srv *Server, version float64, w http.ResponseWriter, r
// allow a nil body for backwards compatibility // allow a nil body for backwards compatibility
if r.Body != nil { if r.Body != nil {
if err := json.NewDecoder(r.Body).Decode(hostConfig); err != nil { if r.Header.Get("Content-Type") == "application/json" {
return err if err := json.NewDecoder(r.Body).Decode(hostConfig); err != nil {
return err
}
} }
} }