From 9795fd450310538f889e4120617dddea5cb0b2b0 Mon Sep 17 00:00:00 2001 From: lihainuo Date: Thu, 8 Oct 2026 14:30:51 +0800 Subject: [PATCH] fix(response): preserve writer state when hijack fails --- response_writer.go | 5 +++-- response_writer_test.go | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/response_writer.go b/response_writer.go index 8e2d8b30..a00bc7a4 100644 --- a/response_writer.go +++ b/response_writer.go @@ -118,10 +118,11 @@ func (w *responseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) { if !ok { return nil, nil, http.ErrNotSupported } - if w.size < 0 { + conn, rw, err := hijacker.Hijack() + if err == nil && w.size < 0 { w.size = 0 } - return hijacker.Hijack() + return conn, rw, err } // CloseNotify implements the http.CloseNotifier interface. diff --git a/response_writer_test.go b/response_writer_test.go index 99548431..150d6dde 100644 --- a/response_writer_test.go +++ b/response_writer_test.go @@ -220,6 +220,54 @@ func TestResponseWriterHijackAfterWrite(t *testing.T) { } } +type failingHijacker struct { + *httptest.ResponseRecorder +} + +func (f *failingHijacker) Hijack() (net.Conn, *bufio.ReadWriter, error) { + return nil, nil, http.ErrNotSupported +} + +func TestResponseWriterHijackFailureKeepsWriterUsable(t *testing.T) { + testWriter := &failingHijacker{ + ResponseRecorder: httptest.NewRecorder(), + } + + writer := &responseWriter{} + writer.reset(testWriter) + + w := ResponseWriter(writer) + + conn, buf, err := w.Hijack() + + assert.Nil(t, conn) + assert.Nil(t, buf) + require.ErrorIs(t, err, http.ErrNotSupported) + + // Hijacking failed before any response was written. + // Keep the writer untouched so the handler can still + // emit a normal HTTP response as a fallback. + assert.False(t, w.Written()) + assert.Equal(t, noWritten, w.Size()) + + http.Error( + w, + "hijack failed", + http.StatusInternalServerError, + ) + + assert.Equal( + t, + http.StatusInternalServerError, + testWriter.Code, + ) + assert.Equal( + t, + "hijack failed\n", + testWriter.Body.String(), + ) +} + // TestResponseWriterHijackAfterWriteHeaderNow verifies that hijacking is allowed after // WriteHeaderNow but blocked after body data is written. func TestResponseWriterHijackAfterWriteHeaderNow(t *testing.T) {