p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1078 from kstaken/fix_json_error

Browse Source 
* Remote API: Small fix in /start if empty host config
Upstream-commit: d1d66b9c5f79dc3c7b6c22c0841d5c2ba96ba51e
Component: engine
This commit is contained in:
Victor Vieux
2013-07-01 16:36:58 -07:00
parent 08f73695ab b0d70e448b
commit b992f88df2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/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
if r.Body != nil {
if err := json.NewDecoder(r.Body).Decode(hostConfig); err != nil {
return err
if r.Header.Get("Content-Type") == "application/json" {
if err := json.NewDecoder(r.Body).Decode(hostConfig); err != nil {
return err
}
}
}