gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Setting application/json for json result.

Browse source 
Setting application/javascript for jsonp result.
This commit is contained in:
Chris Lu 2014-06-13 18:16:03 -07:00
parent d7f6af09e6
commit cb28c26398
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
go/weed/weed_server/common.go
View file

@ -25,7 +25,6 @@ func init() {
}
func writeJson(w http.ResponseWriter, r *http.Request, obj interface{}) (err error) {
w.Header().Set("Content-Type", "application/javascript")
var bytes []byte
if r.FormValue("pretty") != "" {
bytes, err = json.MarshalIndent(obj, "", " ")
@ -37,8 +36,10 @@ func writeJson(w http.ResponseWriter, r *http.Request, obj interface{}) (err err
}
callback := r.FormValue("callback")
if callback == "" {
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(bytes)
} else {
w.Header().Set("Content-Type", "application/javascript")
if _, err = w.Write([]uint8(callback)); err != nil {
return
}