diff options
| author | chrislusf <chris.lu@gmail.com> | 2015-01-08 06:59:30 -0800 |
|---|---|---|
| committer | chrislusf <chris.lu@gmail.com> | 2015-01-08 06:59:30 -0800 |
| commit | ab20cf81975b6977ee8bd5d0b8dbaac6895aa271 (patch) | |
| tree | 03500d4181e103235f81340918a1bb97d17a96ce | |
| parent | ac2ef389d16da2241f4cbe4b9d4eddd6e272a5dc (diff) | |
| parent | fe91fd00ad18d1a1758cee14fb929d512c0bc415 (diff) | |
| download | seaweedfs-ab20cf81975b6977ee8bd5d0b8dbaac6895aa271.tar.xz seaweedfs-ab20cf81975b6977ee8bd5d0b8dbaac6895aa271.zip | |
Merge pull request #53 from aszxqw/master
fix bug: 'http: multiple response.WriteHeader calls'
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | go/weed/weed_server/common.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 46f3c0430..ab4f54fd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ weed +tags +*.swp diff --git a/go/weed/weed_server/common.go b/go/weed/weed_server/common.go index 3968f3191..44ffcce47 100644 --- a/go/weed/weed_server/common.go +++ b/go/weed/weed_server/common.go @@ -65,7 +65,6 @@ func writeJsonQuiet(w http.ResponseWriter, r *http.Request, httpStatus int, obj } } func writeJsonError(w http.ResponseWriter, r *http.Request, httpStatus int, err error) { - w.WriteHeader(http.StatusInternalServerError) m := make(map[string]interface{}) m["error"] = err.Error() writeJsonQuiet(w, r, httpStatus, m) |