From 53a01aebd61e8db34c9106f5b2c5fdad6909caee Mon Sep 17 00:00:00 2001
From: Manuel Woelker <github@manuel.woelker.org>
Date: Wed, 8 Jan 2014 09:14:00 +0100
Subject: [PATCH] Fix for #3345: Add Content-Type Header "application/json" to
 GET /version and /info responses in remote API

Docker-DCO-1.0-Signed-off-by: Manuel Woelker <github@manuel.woelker.org> (github: manuel-woelker)
---
 api.go                  | 2 ++
 integration/api_test.go | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/api.go b/api.go
index 1128c7a2b7..972abbf716 100644
--- a/api.go
+++ b/api.go
@@ -140,6 +140,7 @@ func postAuth(srv *Server, version float64, w http.ResponseWriter, r *http.Reque
 }
 
 func getVersion(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
+	w.Header().Set("Content-Type", "application/json")
 	srv.Eng.ServeHTTP(w, r)
 	return nil
 }
@@ -216,6 +217,7 @@ func getImagesViz(srv *Server, version float64, w http.ResponseWriter, r *http.R
 }
 
 func getInfo(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
+	w.Header().Set("Content-Type", "application/json")
 	srv.Eng.ServeHTTP(w, r)
 	return nil
 }
diff --git a/integration/api_test.go b/integration/api_test.go
index 6cd2e11f39..ff42afac5a 100644
--- a/integration/api_test.go
+++ b/integration/api_test.go
@@ -49,6 +49,10 @@ func TestGetVersion(t *testing.T) {
 	if result := v.Get("Version"); result != expected {
 		t.Errorf("Expected version %s, %s found", expected, result)
 	}
+	expected = "application/json"
+	if result := r.HeaderMap.Get("Content-Type"); result != expected {
+		t.Errorf("Expected Content-Type %s, %s found", expected, result)
+	}
 }
 
 func TestGetInfo(t *testing.T) {
@@ -84,6 +88,10 @@ func TestGetInfo(t *testing.T) {
 	if images := i.GetInt("Images"); images != len(initialImages) {
 		t.Errorf("Expected images: %d, %d found", len(initialImages), images)
 	}
+	expected := "application/json"
+	if result := r.HeaderMap.Get("Content-Type"); result != expected {
+		t.Errorf("Expected Content-Type %s, %s found", expected, result)
+	}
 }
 
 func TestGetEvents(t *testing.T) {