scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 10:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add correct content type to query responses. Fixes #1873

Browse source
This commit is contained in:
Cody Soyland 2019-04-10 14:28:18 -05:00
parent 8041a9fa5f
commit 7bb6fdffcb
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
http/handler.go
View file

@ -964,10 +964,12 @@ func (h *Handler) readURLQueryRequest(r *http.Request) (*pilosa.QueryRequest, er
}
// writeQueryResponse writes the response from the executor to w.
func (h *Handler) writeQueryResponse(w io.Writer, r *http.Request, resp *pilosa.QueryResponse) error {
func (h *Handler) writeQueryResponse(w http.ResponseWriter, r *http.Request, resp *pilosa.QueryResponse) error {
if !validHeaderAcceptJSON(r.Header) {
w.Header().Set("Content-Type", "application/protobuf")
return h.writeProtobufQueryResponse(w, resp)
}
w.Header().Set("Content-Type", "application/json")
return h.writeJSONQueryResponse(w, resp)
}

4
server/handler_test.go
View file

@ -248,6 +248,8 @@ func TestHandler_Endpoints(t *testing.T) {
t.Fatalf("unexpected status code: %d", w.Code)
} else if body := w.Body.String(); body != `{"results":[2]}`+"\n" {
t.Fatalf("unexpected body: %q", body)
} else if w.Header().Get("Content-Type") != "application/json" {
t.Fatalf("unexpected header: %q", w.Header().Get("Content-Type"))
}
})
@ -286,6 +288,8 @@ func TestHandler_Endpoints(t *testing.T) {
t.Fatal(err)
} else if rt, ok := resp.Results[0].(uint64); !ok || rt != 3 {
t.Fatalf("unexpected response type: %#v", resp.Results[0])
} else if w.Header().Get("Content-Type") != "application/protobuf" {
t.Fatalf("unexpected header: %q", w.Header().Get("Content-Type"))
}
})