diff options
| author | Chris Lu <chris.lu@gmail.com> | 2014-06-13 18:16:03 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2014-06-13 18:16:03 -0700 |
| commit | cb28c2639882c4713a42bf66d2e8cebd863cdd1f (patch) | |
| tree | aa9f650226dab1d3090030005651ecb0520058cd /go | |
| parent | d7f6af09e6265c0d4ecef50879195f50d5ffdf30 (diff) | |
| download | seaweedfs-cb28c2639882c4713a42bf66d2e8cebd863cdd1f.tar.xz seaweedfs-cb28c2639882c4713a42bf66d2e8cebd863cdd1f.zip | |
Setting application/json for json result.
Setting application/javascript for jsonp result.
Diffstat (limited to 'go')
| -rw-r--r-- | go/weed/weed_server/common.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/go/weed/weed_server/common.go b/go/weed/weed_server/common.go index 8d8c91da6..a547d7462 100644 --- a/go/weed/weed_server/common.go +++ b/go/weed/weed_server/common.go @@ -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 } |