github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-05 20:26:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

reverseproxy: handle buffered data during hijack (#6274)

Browse Source
This commit is contained in:
WeidiDeng
2024-04-26 23:09:18 +08:00
committed by GitHub
parent 4d6370bf92
commit 1b9042bcdd
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/caddyhttp/responsewriter.go
View File

@ -263,6 +263,8 @@ func (rr *responseRecorder) Hijack() (net.Conn, *bufio.ReadWriter, error) {
conn.(*hijackedConn).updateReadSize(buffered)
data, _ := brw.Peek(buffered)
brw.Reader.Reset(io.MultiReader(bytes.NewReader(data), conn))
// peek to make buffered data appear, as Reset will make it 0
_, _ = brw.Peek(buffered)
} else {
brw.Reader.Reset(conn)
}