From b0d70e448ba5510d2d06c8da7e890796d4a1e26a Mon Sep 17 00:00:00 2001
From: Kimbro Staken <kstaken@kstaken.com>
Date: Sun, 30 Jun 2013 10:46:09 -0700
Subject: [PATCH] Adding check for content-type header Upstream-commit:
 d8d33e8b8bee1f1d37c60b9618a9008058d7abe6 Component: engine

---
 components/engine/api.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/engine/api.go b/components/engine/api.go
index de4113231c..9e5740573e 100644
--- a/components/engine/api.go
+++ b/components/engine/api.go
@@ -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
+			}
 		}
 	}