Fix WebSocket compression

kylecarbs · kylecarbs · commit 673c59d87e96 · 2022-02-05T20:28:18.000Z
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -53,7 +53,7 @@ func (api *api) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
 // Serves the provisioner daemon protobuf API over a WebSocket.
 func (api *api) provisionerDaemonsServe(rw http.ResponseWriter, r *http.Request) {
 	conn, err := websocket.Accept(rw, r, &websocket.AcceptOptions{
-		// Need to disable compression to avoid a data-race
+		// Need to disable compression to avoid a data-race.
 		CompressionMode: websocket.CompressionDisabled,
 	})
 	if err != nil {
diff --git a/codersdk/provisioners.go b/codersdk/provisioners.go
@@ -36,6 +36,8 @@ func (c *Client) ProvisionerDaemonClient(ctx context.Context) (proto.DRPCProvisi
 	}
 	conn, res, err := websocket.Dial(ctx, serverURL.String(), &websocket.DialOptions{
 		HTTPClient: c.httpClient,
+		// Need to disable compression to avoid a data-race.
+		CompressionMode: websocket.CompressionDisabled,
 	})
 	if err != nil {
 		if res == nil {

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ func (c *Client) ProvisionerDaemonClient(ctx context.Context) (proto.DRPCProvisi`
`36`	`36`	`}`
`37`	`37`	`conn, res, err := websocket.Dial(ctx, serverURL.String(), &websocket.DialOptions{`
`38`	`38`	`HTTPClient: c.httpClient,`
	`39`	`+ // Need to disable compression to avoid a data-race.`
	`40`	`+ CompressionMode: websocket.CompressionDisabled,`
`39`	`41`	`})`
`40`	`42`	`if err != nil {`
`41`	`43`	`if res == nil {`