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

Merge pull request #7385 from crosbymichael/return-content-type-error

Browse Source 
Return error for bad content-type
Upstream-commit: e9b4cafd8dc2429124b08c2694f20d196f42f533
Component: engine
This commit is contained in:
Victor Vieux
2014-08-01 16:30:18 -07:00
parent 0dc3563645 93ad6fba3d
commit 026a323acd
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/api/server/server.go
+8 -5
View File
@@ -724,13 +724,16 @@ func postContainersStart(eng *engine.Engine, version version.Version, w http.Res
)
// allow a nil body for backwards compatibility
if r.Body != nil {
if api.MatchesContentType(r.Header.Get("Content-Type"), "application/json") {
if err := job.DecodeEnv(r.Body); err != nil {
return err
}
if r.Body != nil && r.ContentLength > 0 {
if !api.MatchesContentType(r.Header.Get("Content-Type"), "application/json") {
return fmt.Errorf("Content-Type of application/json is required")
}
if err := job.DecodeEnv(r.Body); err != nil {
return err
}
}
if err := job.Run(); err != nil {
if err.Error() == "Container already started" {
w.WriteHeader(http.StatusNotModified)