From 78ac75fe00669f8d24ecab3273d47e805963e4d3 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 1 Aug 2014 15:26:30 -0700 Subject: [PATCH] Return error for bad content-type Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- api/server/server.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/api/server/server.go b/api/server/server.go index 4d8d74f38..b01ce0d0d 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -725,10 +725,12 @@ 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 !api.MatchesContentType(r.Header.Get("Content-Type"), "application/json") { + return fmt.Errorf("Content-Type is not supported: %s", r.Header.Get("Content-Type")) + } + + if err := job.DecodeEnv(r.Body); err != nil { + return err } } if err := job.Run(); err != nil {