fix(response): preserve writer state when hijack fails

This commit is contained in:
lihainuo 2026-10-08 14:30:51 +08:00
parent 43fe48e8a0
commit 9795fd4503
2 changed files with 51 additions and 2 deletions

View File

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

View File

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