Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[fix] ensure handleUpgrade doesn't break if socket is just a stream #2165

Merged
merged 2 commits into from
Aug 31, 2023
Merged

[fix] ensure handleUpgrade doesn't break if socket is just a stream #2165

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2cf8cf
[fix] ensure handleUpgrade doesn't break if socket is just a stream
pimterry Aug 30, 2023
8943b56
[fix] improve upgrade-a-stream fix: add a test & handle setTimeout too
pimterry Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,10 @@ class WebSocket extends EventEmitter {
receiver.on('pong', receiverOnPong);

socket.setTimeout(0);
socket.setNoDelay();
if (socket.setNoDelay) {
// May not be available if 'socket' is actually a stream
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nits:

Suggested change
// May not be available if 'socket' is actually a stream
//
// May not be available if `socket` is actually a stream.
//

socket.setNoDelay();
}

if (head.length > 0) socket.unshift(head);

Expand Down