inspector: handle socket close before close frame #12937
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nodejs-github-bot
added
c++
|
At least one popular frontend is not properly following WS protocol specification, this change protects from such clients. |
jasnell
approved these changes
May 9, 2017
alessiodionisi
approved these changes
May 10, 2017
cjihrig
requested changes
May 10, 2017
src/inspector_socket.cc
Outdated
| @@ -335,6 +335,10 @@ static void websockets_data_cb(uv_stream_t* stream, ssize_t nread, | |||
| if (!inspector->shutting_down && inspector->ws_state->read_cb) { | |||
| inspector->ws_state->read_cb(stream, nread, nullptr); | |||
| } | |||
| if (inspector->ws_state->close_sent | |||
| && !inspector->ws_state->received_close) { | |||
There was a problem hiding this comment.
Can you move the && to the previous line.
|
@cjihrig I have addressed the comment. Please take another look. |
cjihrig
approved these changes
May 12, 2017
|
Landed as 7c3a23b |
anchnk
pushed a commit
to anchnk/node
that referenced
this pull request
May 19, 2017
This change handles clients that respond to close request with a TCP close instead of close response. PR-URL: nodejs#12937 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change handles clients that respond to close request with a TCP
close instead of close response.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
inpsector: updated the protocol handler and added a test case.