From 7304c840e3f25c0e59f12a708d82da6223c4d1bd Mon Sep 17 00:00:00 2001 From: yanyiwu Date: Thu, 8 Jan 2015 16:15:04 +0800 Subject: [PATCH 1/2] update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 46f3c0430..ab4f54fd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ weed +tags +*.swp From fe91fd00ad18d1a1758cee14fb929d512c0bc415 Mon Sep 17 00:00:00 2001 From: yanyiwu Date: Thu, 8 Jan 2015 19:04:10 +0800 Subject: [PATCH 2/2] fix bug: 'http: multiple response.WriteHeader calls' --- go/weed/weed_server/common.go | 1 - 1 file changed, 1 deletion(-) 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)