Merge 283f36e5cc768cef1caf82b507340d61d8106535 into 0f09c3a9b4626d9fe9979cf4d0521d6ae32ab646

This commit is contained in:
Dhruv P. 2026-10-26 10:02:59 +00:00 committed by GitHub
commit 6f08cbb790
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 55 additions and 5 deletions

View File

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

View File

@ -7,8 +7,10 @@ package render
import (
"net/http/httptest"
"strings"
"sync"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@ -21,3 +23,54 @@ 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())
}
// Run with -race: rendering concurrently with a shared Headers map must not
// write to the map.
func TestReaderRenderConcurrentSharedHeaders(t *testing.T) {
headers := map[string]string{"Cache-Control": "public"}
const goroutines = 50
var wg sync.WaitGroup
wg.Add(goroutines)
for range goroutines {
go func() {
defer wg.Done()
r := Reader{
ContentLength: 5,
Reader: strings.NewReader("hello"),
Headers: headers,
}
assert.NoError(t, r.Render(httptest.NewRecorder()))
}()
}
wg.Wait()
require.Equal(t, map[string]string{"Cache-Control": "public"}, headers)
}