diff --git a/caddytest/integration/stream_reload_stress_test.go b/caddytest/integration/stream_reload_stress_test.go index cd0b354ca..45473e221 100644 --- a/caddytest/integration/stream_reload_stress_test.go +++ b/caddytest/integration/stream_reload_stress_test.go @@ -86,12 +86,12 @@ func TestReverseProxyReloadStressUpgradedStreamsHeapProfiles(t *testing.T) { } type stressRunResult struct { - streamCount int - aliveAfterReloads int + streamCount int + aliveAfterReloads int aliveBeforeDelayExpiry int // only meaningful for close_delay mode - beforeReload heapSnapshot - midReload heapSnapshot // after all reloads, before delay expiry clean-up - afterReload heapSnapshot // after all streams have been fully cleaned up + beforeReload heapSnapshot + midReload heapSnapshot // after all reloads, before delay expiry clean-up + afterReload heapSnapshot // after all streams have been fully cleaned up } type heapSnapshot struct { diff --git a/modules/caddyhttp/reverseproxy/streaming.go b/modules/caddyhttp/reverseproxy/streaming.go index 37fca6014..d86796e58 100644 --- a/modules/caddyhttp/reverseproxy/streaming.go +++ b/modules/caddyhttp/reverseproxy/streaming.go @@ -246,7 +246,7 @@ func (h *Handler) handleH2UpgradeTunnel( var ( toBackend int64 fromBackend int64 - result = "closed" + result string ) // when a stream timeout is encountered, no error will be read from errc