Skip to content

Conversation

@TingDaoK
Copy link
Contributor

Issue #, if available:

Description of changes:
Cancel the CLOSE frame when it is blocked

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@TingDaoK TingDaoK requested a review from graebm August 10, 2020 16:02
Copy link
Contributor

@justinboswell justinboswell left a comment

Choose a reason for hiding this comment

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

LGTM, I would want @graebm 's opinion though

Copy link
Contributor

@graebm graebm left a comment

Choose a reason for hiding this comment

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

fix and ship

Nice work.


if (!websocket->thread_data.is_waiting_for_write_completion) {
/* Not waiting for write to complete, which means the CLOSE frame has sent, just do nothing */
return;
Copy link
Contributor

Choose a reason for hiding this comment

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

if (!websocket->thread_data.is_waiting_for_write_completion)
if (!websocket->is_shutting_down_and_waiting_for_close_frame_to_be_written)

@TingDaoK TingDaoK merged commit 98b3e49 into master Aug 10, 2020
@TingDaoK TingDaoK deleted the websocket-close-timeout branch August 10, 2020 19:15
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.

3 participants