openssl: fix handling of buffered data#17601
Closed
icing wants to merge 2 commits intocurl:masterfrom
Closed
Conversation
`SSL_pending()` only checks if the *current* TLS packet has more data. There might be more data in SSL's buffers. `SSL_has_pending()` only checks if there is data in buffers, but does *not* check if there is a complete TLS packet that can be decoded. If we only check the first, we will poll on socket events with having processed all data and may stall. If we only check the second, we would busy loop without SSL_read() ever giving something. Add the flag `connssl->input_pending` that is set on incoming data in the BIO receive. Clear the flag when encountering a CURLE_AGAIN on the filters receive (via SSL_read()). refs curl#17596
Contributor
Author
|
@vszakats, when you have time it would be nice to merge this. Fixes Ci failures. Thanks! |
vszakats
approved these changes
Jun 12, 2025
Member
|
Thanks @icing, merged! |
denandz
pushed a commit
to denandz/curl
that referenced
this pull request
Jun 21, 2025
`SSL_pending()` only checks if the *current* TLS packet has more data. There might be more data in SSL's buffers. `SSL_has_pending()` only checks if there is data in buffers, but does *not* check if there is a complete TLS packet that can be decoded. If we only check the first, we will poll on socket events without having processed all data and may stall. If we only check the second, we would busy loop without SSL_read() ever giving something. Add the flag `connssl->input_pending` that is set on incoming data in the BIO receive. Clear the flag when encountering a CURLE_AGAIN on the filters receive (via SSL_read()) or see an EOF. Ref: curl#17596 Closes curl#17601
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
SSL_pending()only checks if the current TLS packet has more data. There might be more data in SSL's buffers.SSL_has_pending()only checks if there is data in buffers, but does not check if there is a complete TLS packet that can be decoded.If we only check the first, we will poll on socket events without having processed all data and may stall. If we only check the second, we would busy loop without SSL_read() ever giving something.
Add the flag
connssl->input_pendingthat is set on incoming data in the BIO receive. Clear the flag when encountering a CURLE_AGAIN on the filters receive (via SSL_read()) or see an EOF.refs #17596