Stowage/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-12-08 06:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

capture the buffered body once, then reset clonedReq.Body before each retry

Browse source
This commit is contained in:
chebyrash 2025-11-21 16:01:43 +04:00
parent b9e6f3b227
commit f9aefaff3e
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/caddyhttp/reverseproxy/reverseproxy.go
View file

@ -437,6 +437,11 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyht
reqHost := clonedReq.Host reqHost := clonedReq.Host
reqHeader := clonedReq.Header reqHeader := clonedReq.Header
var bufferedReqBody []byte
if reqBodyBuf, ok := clonedReq.Body.(bodyReadCloser); ok && reqBodyBuf.body == nil {
bufferedReqBody = append([]byte(nil), reqBodyBuf.buf.Bytes()...)
}
start := time.Now() start := time.Now()
defer func() { defer func() {
// total proxying duration, including time spent on LB and retries // total proxying duration, including time spent on LB and retries
@ -455,8 +460,8 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyht
// and reusable, so if a backend partially or fully reads the body but then // and reusable, so if a backend partially or fully reads the body but then
// produces an error, the request can be repeated to the next backend with // produces an error, the request can be repeated to the next backend with
// the full body (retries should only happen for idempotent requests) (see #6259) // the full body (retries should only happen for idempotent requests) (see #6259)
if reqBodyBuf, ok := r.Body.(bodyReadCloser); ok && reqBodyBuf.body == nil { if bufferedReqBody != nil {
r.Body = io.NopCloser(bytes.NewReader(reqBodyBuf.buf.Bytes())) clonedReq.Body = io.NopCloser(bytes.NewReader(bufferedReqBody))
} }
var done bool var done bool