Skip to content

Commit

Permalink
panic when reading from backend failed to propagate stream error (#5952)
Browse files Browse the repository at this point in the history
  • Loading branch information
WeidiDeng authored Nov 23, 2023
1 parent 878d491 commit 4de2c1c
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions modules/caddyhttp/reverseproxy/reverseproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -962,10 +962,12 @@ func (h *Handler) finalizeResponse(
if err != nil {
// we're streaming the response and we've already written headers, so
// there's nothing an error handler can do to recover at this point;
// the standard lib's proxy panics at this point, but we'll just log
// the error and abort the stream here
// we'll just log the error and abort the stream here and panic just as
// the standard lib's proxy to propagate the stream error.
// see issue https://github.com/caddyserver/caddy/issues/5951
logger.Error("aborting with incomplete response", zap.Error(err))
return nil
// no extra logging from stdlib
panic(http.ErrAbortHandler)
}

if len(res.Trailer) > 0 {
Expand Down

0 comments on commit 4de2c1c

Please sign in to comment.