ntls: Convert WouldBlock to ConnectionFailed #699
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
johan-bjareholt
commented
Jan 4, 2024
johan-bjareholt
force-pushed
the
would-block-error
branch
3 times, most recently
from
df21d86 to
eb74e99
Compare
|
The tests were broken on master, fixed it in a seperate commit. |
johan-bjareholt
force-pushed
the
would-block-error
branch
3 times, most recently
from
9d02616 to
e7211ff
Compare
Seems to be the same thing as was fixed in #696, but not yet merged. |
|
It's merged now, but I'm trying to fix this, so accepting PRs are a bit stalled: #688 |
johan-bjareholt
force-pushed
the
would-block-error
branch
from
e7211ff to
c0b908e
Compare
When the tls handshake starts and the server doesn't respond, the std::net::TcpStream will return WouldBlock or TimedOut when a read/write times out to the socket, which in turn native_tls will convert to a HandshakeError::WouldBlock. Instead of returning back a io::Error with no type, return io::Error with kind TimedOut.
johan-bjareholt
force-pushed
the
would-block-error
branch
from
c0b908e to
b58bbfa
Compare
|
Hello @algesten, could you take a look at this again? Thanks! |
algesten
approved these changes
Feb 6, 2024
|
Thanks! |
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.
When the tls handshake starts and the server doesn't respond, the std::net::TcpStream will return WouldBlock or TimedOut when a read/write times out to the socket, which in turn native_tls will convert to a HandshakeError::WouldBlock.
Solves #686