lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-14 23:56:51 +08:00
Code Issues Actions Packages 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
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) { func writeJson(w http.ResponseWriter, r *http.Request, obj interface{}) (err error) {
w.Header().Set("Content-Type", "application/javascript")
var bytes []byte var bytes []byte
if r.FormValue("pretty") != "" { if r.FormValue("pretty") != "" {
bytes, err = json.MarshalIndent(obj, "", " ") 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") callback := r.FormValue("callback")
if callback == "" { if callback == "" {
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(bytes) _, err = w.Write(bytes)
} else { } else {
w.Header().Set("Content-Type", "application/javascript")
if _, err = w.Write([]uint8(callback)); err != nil { if _, err = w.Write([]uint8(callback)); err != nil {
return return
} }