proxy: only apply proxy timeout to non-websocket requests (#155)

Updates the HTTP proxy (both server and agent) to only apply the timeout to non-websocket requests.
andydunstall · Aug 15, 2024 · 685afd2 · 685afd2
1 parent 689648d
commit 685afd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/agent/reverseproxy/reverseproxy.go b/agent/reverseproxy/reverseproxy.go
@@ -43,7 +43,7 @@ func NewReverseProxy(conf config.ListenerConfig, logger log.Logger) *ReverseProx
 }
 
 func (p *ReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if p.timeout != 0 {
+	if p.timeout != 0 && r.Header.Get("upgrade") != "websocket" {
 		ctx, cancel := context.WithTimeout(r.Context(), p.timeout)
 		defer cancel()
 

diff --git a/server/proxy/httpproxy.go b/server/proxy/httpproxy.go
@@ -92,7 +92,7 @@ func (p *HTTPProxy) ServeHTTPWithUpstream(
 	endpointID string,
 	upstream upstream.Upstream,
 ) {
-	if p.timeout != 0 {
+	if p.timeout != 0 && r.Header.Get("upgrade") != "websocket" {
 		ctx, cancel := context.WithTimeout(r.Context(), p.timeout)
 		defer cancel()