Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdhttp: add Content-Type: application/json header to version handler

Browse Source
This commit is contained in:
Xiang Li 2015-09-25 15:06:51 -07:00
parent c9be719d92
commit 1226838381
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etcdserver/etcdhttp/client.go
View File

@ -381,6 +381,7 @@ func serveVersion(w http.ResponseWriter, r *http.Request, clusterV string) {
Cluster: clusterV, Cluster: clusterV,
} }
w.Header().Set("Content-Type", "application/json")
b, err := json.Marshal(&vs) b, err := json.Marshal(&vs)
if err != nil { if err != nil {
plog.Panicf("cannot marshal versions to json (%v)", err) plog.Panicf("cannot marshal versions to json (%v)", err)

3
etcdserver/etcdhttp/client_test.go
View File

@ -1341,6 +1341,9 @@ func TestServeVersion(t *testing.T) {
if g := rw.Body.String(); g != string(w) { if g := rw.Body.String(); g != string(w) {
t.Fatalf("body = %q, want %q", g, string(w)) t.Fatalf("body = %q, want %q", g, string(w))
} }
if ct := rw.HeaderMap.Get("Content-Type"); ct != "application/json" {
t.Errorf("contet-type header = %s, want %s", ct, "application/json")
}
} }
func TestServeVersionFails(t *testing.T) { func TestServeVersionFails(t *testing.T) {