kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #3402 from manuel-woelker/3345-add-content-type-header-to-version-remote-api 

Fix for #3345: Add Content-Type Header "application/json" to GET /version response in remote API
This commit is contained in:
Victor Vieux 2014-01-08 10:15:22 -08:00
parent 322a42b8a2 53a01aebd6
commit 149156a272
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api.go
View File

@ -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 { 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) srv.Eng.ServeHTTP(w, r)
return nil 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 { 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) srv.Eng.ServeHTTP(w, r)
return nil return nil
} }

8
integration/api_test.go
View File

@ -49,6 +49,10 @@ func TestGetVersion(t *testing.T) {
if result := v.Get("Version"); result != expected { if result := v.Get("Version"); result != expected {
t.Errorf("Expected version %s, %s found", expected, result) 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) { func TestGetInfo(t *testing.T) {
@ -84,6 +88,10 @@ func TestGetInfo(t *testing.T) {
if images := i.GetInt("Images"); images != len(initialImages) { if images := i.GetInt("Images"); images != len(initialImages) {
t.Errorf("Expected images: %d, %d found", len(initialImages), images) 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) { func TestGetEvents(t *testing.T) {