Skip to content

chore: add cherry-picks #15898 and #15927 to backport the fix to #15616 #16265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2025

Conversation

spikecurtis
Copy link
Contributor

Cherry-picks #15898 and #15927 to backport the fix to #15616

#15927 is the fix, but it depends on #15898 because of some earlier work in the tailscale fork to move everything to coder/websocket

---------------------
chore: migrate to coder/websocket 1.8.12 (#15898)

Migrates us to `coder/websocket` v1.8.12 rather than `nhooyr/websocket` on an older version.

Works around coder/websocket#504 by adding an explicit test for `xerrors.Is(err, io.EOF)` where we were previously getting `io.EOF` from the netConn.
@spikecurtis spikecurtis changed the title Cherry-picks #15898 and #15927 to backport the fix to #15616 chore: add cherry-picks #15898 and #15927 to backport the fix to #15616 Jan 27, 2025
@spikecurtis spikecurtis merged commit 8fffdce into release/2.18 Jan 27, 2025
30 of 31 checks passed
@spikecurtis spikecurtis deleted the spike/cherry-pick-15616-2.18 branch January 27, 2025 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants