diff --git a/render/reader.go b/render/reader.go index ae1a7b5e..a8cab670 100644 --- a/render/reader.go +++ b/render/reader.go @@ -21,11 +21,8 @@ type Reader struct { // Render (Reader) writes data with custom ContentType and headers. func (r Reader) Render(w http.ResponseWriter) (err error) { r.WriteContentType(w) - if r.ContentLength >= 0 { - if r.Headers == nil { - r.Headers = map[string]string{} - } - r.Headers["Content-Length"] = strconv.FormatInt(r.ContentLength, 10) + if r.ContentLength >= 0 && w.Header().Get("Content-Length") == "" { + w.Header().Set("Content-Length", strconv.FormatInt(r.ContentLength, 10)) } r.writeHeaders(w) _, err = io.Copy(w, r.Reader) diff --git a/render/reader_test.go b/render/reader_test.go index aaceb9ea..297800b1 100644 --- a/render/reader_test.go +++ b/render/reader_test.go @@ -21,3 +21,30 @@ func TestReaderRenderNoHeaders(t *testing.T) { err := r.Render(httptest.NewRecorder()) require.NoError(t, err) } + +func TestReaderRenderDoesNotModifyHeaders(t *testing.T) { + headers := map[string]string{"Cache-Control": "public"} + + w := httptest.NewRecorder() + r := Reader{ + ContentLength: 5, + Reader: strings.NewReader("hello"), + Headers: headers, + } + require.NoError(t, r.Render(w)) + require.Equal(t, map[string]string{"Cache-Control": "public"}, headers) + require.Equal(t, "5", w.Header().Get("Content-Length")) + + // Reusing the same map for a response of unknown length must not + // carry over the Content-Length of the previous response. + w = httptest.NewRecorder() + r = Reader{ + ContentLength: -1, + Reader: strings.NewReader("hello, world!"), + Headers: headers, + } + require.NoError(t, r.Render(w)) + require.Empty(t, w.Header().Get("Content-Length")) + require.Equal(t, "public", w.Header().Get("Cache-Control")) + require.Equal(t, "hello, world!", w.Body.String()) +}