Browse Source

Merge pull request #53 from aszxqw/master

fix bug: 'http: multiple response.WriteHeader calls'
pull/54/head
chrislusf 10 years ago
parent
commit
ab20cf8197
  1. 2
      .gitignore
  2. 1
      go/weed/weed_server/common.go

2
.gitignore

@ -1 +1,3 @@
weed
tags
*.swp

1
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)

Loading…
Cancel
Save