Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore: cherry-pick patches for 2.17.3 #15852

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 5 commits into from
Dec 12, 2024
Merged

chore: cherry-pick patches for 2.17.3 #15852

merged 5 commits into from
Dec 12, 2024

Conversation

stirby
Copy link
Collaborator

@stirby stirby commented Dec 12, 2024

No description provided.

spikecurtis and others added 5 commits December 11, 2024 17:56
fixes #14881

Our handlers for streaming logs don't read from the websocket. We don't allow the client to send us any data, but the websocket library we use requires reading from the websocket to properly handle pings and closing. Not doing so can [can cause the websocket to hang on write](coder/websocket#405), leaking go routines which were noticed in #14881.

This fixes the issue, and in process refactors our log streaming to a encoder/decoder package which provides generic types for sending JSON over websocket.

I'd also like for us to upgrade to the latest https://github.com/coder/websocket but we should also upgrade our tailscale fork before doing so to avoid including two copies of the websocket library.

(cherry picked from commit 148a5a3)
Fixes a bug where a file produced by `generateVersionFiles` (as used
when uploading a web UI edited template) produced a file where the
`type` field was unset.
This meant the change in #15410 used the unset type value as the content
header when uploading, causing it to always fail.

(cherry picked from commit d2e4969)
)

![image](https://github.com/user-attachments/assets/15ae6dc4-84a3-4c20-b603-ed38cc14a250)
Despite being encoded the same, the API was previously rejecting zip
files with this MIME type.

(cherry picked from commit f7cbf5d)
@stirby stirby requested review from matifali, bcpeinhardt and bpmct and removed request for bcpeinhardt December 12, 2024 19:33
@stirby stirby changed the title Patch cherry-picks for 2.17.3 chore: Patch cherry-picks for 2.17.3 Dec 12, 2024
@stirby stirby changed the title chore: Patch cherry-picks for 2.17.3 chore: patch cherry-picks for 2.17.3 Dec 12, 2024
@stirby stirby changed the title chore: patch cherry-picks for 2.17.3 chore: cherry-pick patches for 2.17.3 Dec 12, 2024
@stirby stirby merged commit 7011e4b into release/2.17 Dec 12, 2024
37 of 39 checks passed
@stirby stirby deleted the patch-2.17.3 branch December 12, 2024 20:48
@github-actions github-actions bot locked and limited conversation to collaborators Dec 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants