Skip to content

fix: prevent superfluous response.WriteHeader call in EncodeJSONResponse #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kubudak90 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: prevent superfluous response.WriteHeader call in EncodeJSONResponse #537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions server/routers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package server

import (
"bytes"
"encoding/json"
"net/http"

Expand Down Expand Up @@ -79,10 +80,14 @@ func NewRouter(routers ...Router) http.Handler {
// EncodeJSONResponse uses the json encoder to write an interface to the http response with an
// optional status code
func EncodeJSONResponse(i interface{}, status int, w http.ResponseWriter) {
w.Header().Set("Content-Type", "application/json; charset=UTF-8")
w.WriteHeader(status)

if err := json.NewEncoder(w).Encode(i); err != nil {
// Encode to buffer first to avoid superfluous WriteHeader call on error
var buf bytes.Buffer
if err := json.NewEncoder(&buf).Encode(i); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}

w.Header().Set("Content-Type", "application/json; charset=UTF-8")
w.WriteHeader(status)
w.Write(buf.Bytes())
}