From 1d68cab11a76032df420471487e8bbe2e837e080 Mon Sep 17 00:00:00 2001 From: liqiang2 Date: Sun, 25 Oct 2026 13:56:57 +0800 Subject: [PATCH] fix(response): propagate flush errors through ResponseController --- response_writer.go | 9 ++++++--- response_writer_test.go | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/response_writer.go b/response_writer.go index 8e2d8b30..b62a18e5 100644 --- a/response_writer.go +++ b/response_writer.go @@ -134,10 +134,13 @@ func (w *responseWriter) CloseNotify() <-chan bool { // Flush implements the http.Flusher interface. func (w *responseWriter) Flush() { + _ = w.FlushError() +} + +// FlushError flushes buffered data and returns any error from the underlying writer. +func (w *responseWriter) FlushError() error { w.WriteHeaderNow() - if f, ok := w.ResponseWriter.(http.Flusher); ok { - f.Flush() - } + return http.NewResponseController(w.ResponseWriter).Flush() } func (w *responseWriter) Pusher() (pusher http.Pusher) { diff --git a/response_writer_test.go b/response_writer_test.go index 99548431..fe8ab8de 100644 --- a/response_writer_test.go +++ b/response_writer_test.go @@ -9,7 +9,9 @@ import ( "net" "net/http" "net/http/httptest" + "os" "testing" + "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -32,6 +34,7 @@ func TestResponseWriterFlushWithNonFlusher(t *testing.T) { require.NotPanics(t, func() { writer.Flush() }) + require.ErrorIs(t, http.NewResponseController(writer).Flush(), http.ErrNotSupported) } // nonFlusherWriter is a minimal http.ResponseWriter that does NOT implement http.Flusher. @@ -295,6 +298,40 @@ func TestResponseWriterFlush(t *testing.T) { assert.Equal(t, http.StatusInternalServerError, resp.StatusCode) } +func TestResponseControllerFlushWriteDeadline(t *testing.T) { + type result struct { + deadlineErr error + writeErr error + flushErr error + } + results := make(chan result, 1) + router := New() + router.GET("/", func(c *Context) { + controller := http.NewResponseController(c.Writer) + deadlineErr := controller.SetWriteDeadline(time.Now().Add(-time.Second)) + _, writeErr := c.Writer.WriteString("buffered response") + flushErr := controller.Flush() + results <- result{deadlineErr: deadlineErr, writeErr: writeErr, flushErr: flushErr} + }) + server := httptest.NewServer(router) + t.Cleanup(server.Close) + client := server.Client() + client.Timeout = 5 * time.Second + response, err := client.Get(server.URL) + if response != nil { + _ = response.Body.Close() + } + require.Error(t, err) + select { + case got := <-results: + require.NoError(t, got.deadlineErr) + require.NoError(t, got.writeErr) + require.ErrorIs(t, got.flushErr, os.ErrDeadlineExceeded) + case <-time.After(5 * time.Second): + t.Fatal("handler did not report its flush result") + } +} + func TestResponseWriterStatusCode(t *testing.T) { testWriter := httptest.NewRecorder() writer := &responseWriter{}