TUN-4069: Fix regression on support for websocket over proxy

2021-03-09 17:16:17 +00:00 · 2021-03-09 17:16:17 +00:00 · 4296b23087
parent 452f8cef79
commit 4296b23087
2 changed files with 3 additions and 1 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -22,7 +22,8 @@

 ### Bug Fixes

- none
+- GitHub [PR #317](https://github.com/cloudflare/cloudflared/issues/317) was broken in 2021.2.5 and is now fixed again.
+

 ## 2021.2.5

--- a/carrier/websocket.go
+++ b/carrier/websocket.go
@ -82,6 +82,7 @@ func createWebsocketStream(options *StartOptions, log *zerolog.Logger) (*cfwebso

 	dialer := &websocket.Dialer{
 		TLSClientConfig: options.TLSClientConfig,
+		Proxy:           http.ProxyFromEnvironment,
 	}
 	wsConn, resp, err := cfwebsocket.ClientConnect(req, dialer)
 	defer closeRespBody(resp)