From b84cb058484e7900d60324da1289d319c77f5447 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Mon, 20 May 2019 22:00:54 -0600 Subject: Fix deferred header ops --- modules/caddyhttp/staticresp.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'modules/caddyhttp/staticresp.go') diff --git a/modules/caddyhttp/staticresp.go b/modules/caddyhttp/staticresp.go index e07084a..47fae22 100644 --- a/modules/caddyhttp/staticresp.go +++ b/modules/caddyhttp/staticresp.go @@ -17,7 +17,7 @@ func init() { // Static implements a simple responder for static responses. type Static struct { - StatusCode int `json:"status_code"` + StatusCode int `json:"status_code"` // TODO: should we turn this into a string so that only one field is needed? (string allows replacements) StatusCodeStr string `json:"status_code_str"` Headers http.Header `json:"headers"` Body string `json:"body"` @@ -30,7 +30,7 @@ func (s Static) ServeHTTP(w http.ResponseWriter, r *http.Request) error { // close the connection after responding r.Close = s.Close - // set all headers, with replacements + // set all headers for field, vals := range s.Headers { field = repl.ReplaceAll(field, "") for i := range vals { @@ -39,7 +39,7 @@ func (s Static) ServeHTTP(w http.ResponseWriter, r *http.Request) error { w.Header()[field] = vals } - // write the headers with a status code + // get the status code statusCode := s.StatusCode if statusCode == 0 && s.StatusCodeStr != "" { intVal, err := strconv.Atoi(repl.ReplaceAll(s.StatusCodeStr, "")) @@ -50,9 +50,11 @@ func (s Static) ServeHTTP(w http.ResponseWriter, r *http.Request) error { if statusCode == 0 { statusCode = http.StatusOK } + + // write headers w.WriteHeader(statusCode) - // write the response body, with replacements + // write response body if s.Body != "" { fmt.Fprint(w, repl.ReplaceAll(s.Body, "")) } -- cgit v1.2.3