Skip to content

Commit 238f110

Browse files
committed
reverseproxy: Revert #4952 - don't ignore context cancellation in stream mode
i.e. Revert commit f5dce84 Two years ago, the patch in #4952 was a seemingly necessary way to fix an issue (sort of an edge case), but it broke other more common use cases (see #6666). Now, as of #6669, it seems like the original issue can no longer be replicated, so we are reverting that patch, because it was incorrect anyway. If it turns out the original issue returns, a more proper patch may be in #6669 (even if used as a baseline for a future fix). A potential future fix could be an opt-in setting.
1 parent b183aec commit 238f110

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

modules/caddyhttp/reverseproxy/reverseproxy.go

-14
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,6 @@ type Handler struct {
108108
// response is recognized as a streaming response, or if its
109109
// content length is -1; for such responses, writes are flushed
110110
// to the client immediately.
111-
//
112-
// Normally, a request will be canceled if the client disconnects
113-
// before the response is received from the backend. If explicitly
114-
// set to -1, client disconnection will be ignored and the request
115-
// will be completed to help facilitate low-latency streaming.
116111
FlushInterval caddy.Duration `json:"flush_interval,omitempty"`
117112

118113
// A list of IP ranges (supports CIDR notation) from which
@@ -833,15 +828,6 @@ func (h *Handler) reverseProxy(rw http.ResponseWriter, req *http.Request, origRe
833828
}
834829
req = req.WithContext(httptrace.WithClientTrace(req.Context(), trace))
835830

836-
// if FlushInterval is explicitly configured to -1 (i.e. flush continuously to achieve
837-
// low-latency streaming), don't let the transport cancel the request if the client
838-
// disconnects: user probably wants us to finish sending the data to the upstream
839-
// regardless, and we should expect client disconnection in low-latency streaming
840-
// scenarios (see issue #4922)
841-
if h.FlushInterval == -1 {
842-
req = req.WithContext(context.WithoutCancel(req.Context()))
843-
}
844-
845831
// do the round-trip
846832
start := time.Now()
847833
res, err := h.Transport.RoundTrip(req)

0 commit comments

Comments
 (0)