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.

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

Fix: flush writers before potentially expecting a response #1542

Merged
merged 1 commit into from
Oct 18, 2023

Conversation

robsdedude
Copy link
Contributor

Fixes #1537

rustls/src/conn.rs Outdated Show resolved Hide resolved
@robsdedude robsdedude changed the title Fix flush writer Fix: flush writers before potentially expecting a response Oct 17, 2023
@codecov
Copy link

codecov bot commented Oct 17, 2023

Codecov Report

Merging #1542 (fd0d418) into main (ac10422) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #1542   +/-   ##
=======================================
  Coverage   96.46%   96.46%           
=======================================
  Files          74       74           
  Lines       15113    15115    +2     
=======================================
+ Hits        14579    14581    +2     
  Misses        534      534           
Files Coverage Δ
rustls/src/conn.rs 93.00% <100.00%> (+0.04%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Member

@cpu cpu left a comment

Choose a reason for hiding this comment

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

Thanks! This looks good to me. I also verified that backing out the changes in rustls/src/conn.rs but leaving the new unit tests provokes the expected failure as we'd expect 👍

@cpu
Copy link
Member

cpu commented Oct 17, 2023

@robsdedude Would you mind squashing your commits down into one? That will let us do the usual merge queue w/ the rebase strategy while also keeping the commit history clean in main.

Copy link
Member

@ctz ctz left a comment

Choose a reason for hiding this comment

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

Thanks!

@ctz ctz added this pull request to the merge queue Oct 18, 2023
Merged via the queue into rustls:main with commit 0bbc1cf Oct 18, 2023
22 checks passed
@robsdedude robsdedude deleted the fix-flush-writer branch October 18, 2023 07:57
@djc
Copy link
Member

djc commented Oct 18, 2023

Open question: should we backport this to 0.21.x?

@cpu
Copy link
Member

cpu commented Oct 18, 2023

Open question: should we backport this to 0.21.x?

I think we might as well. It seems like a clear cut bugfix and we have a branch in preparation already. I can add this.

@cpu cpu mentioned this pull request Oct 18, 2023
4 tasks
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.

rustls doesn't flush the writer
4 participants