Merge pull request #7385 from crosbymichael/return-content-type-error
Return error for bad content-type
This commit is contained in:
commit
e9b4cafd8d
|
@ -724,13 +724,16 @@ func postContainersStart(eng *engine.Engine, version version.Version, w http.Res
|
||||||
)
|
)
|
||||||
|
|
||||||
// allow a nil body for backwards compatibility
|
// allow a nil body for backwards compatibility
|
||||||
if r.Body != nil {
|
if r.Body != nil && r.ContentLength > 0 {
|
||||||
if api.MatchesContentType(r.Header.Get("Content-Type"), "application/json") {
|
if !api.MatchesContentType(r.Header.Get("Content-Type"), "application/json") {
|
||||||
if err := job.DecodeEnv(r.Body); err != nil {
|
return fmt.Errorf("Content-Type of application/json is required")
|
||||||
return err
|
}
|
||||||
}
|
|
||||||
|
if err := job.DecodeEnv(r.Body); err != nil {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := job.Run(); err != nil {
|
if err := job.Run(); err != nil {
|
||||||
if err.Error() == "Container already started" {
|
if err.Error() == "Container already started" {
|
||||||
w.WriteHeader(http.StatusNotModified)
|
w.WriteHeader(http.StatusNotModified)
|
||||||
|
|
Loading…
Reference in New Issue