curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Nuno Diegues 2021-03-09 17:16:17 +00:00
parent 452f8cef79
commit 4296b23087
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -22,7 +22,8 @@
### Bug Fixes ### 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 ## 2021.2.5

1
carrier/websocket.go
View File

@ -82,6 +82,7 @@ func createWebsocketStream(options *StartOptions, log *zerolog.Logger) (*cfwebso
dialer := &websocket.Dialer{ dialer := &websocket.Dialer{
TLSClientConfig: options.TLSClientConfig, TLSClientConfig: options.TLSClientConfig,
Proxy: http.ProxyFromEnvironment,
} }
wsConn, resp, err := cfwebsocket.ClientConnect(req, dialer) wsConn, resp, err := cfwebsocket.ClientConnect(req, dialer)
defer closeRespBody(resp) defer closeRespBody(resp)