Skip to content

Fix SSL handshake partial send #6635

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.

Sign up for GitHub

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

Merged
youknowone merged 6 commits into from
Jan 4, 2026
Merged

Fix SSL handshake partial send #6635

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a07e8e
simplify test_ftplib
youknowone Jan 4, 2026
4e3b298
mark flaky test
youknowone Jan 4, 2026
df1d22c
better ssl handshake, pending tls output
youknowone Jan 4, 2026
1bbd933
flush_all_pending
youknowone Jan 4, 2026
8baade6
deadline
youknowone Jan 4, 2026
23436d4
flush pending
youknowone Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
flush pending
  • Loading branch information
@youknowone
youknowone committed Jan 4, 2026
commit 23436d4fc5552fa57f09654499cf055d950b0318
10 changes: 10 additions & 0 deletions crates/stdlib/src/ssl/compat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,6 +1473,16 @@ pub(super) fn ssl_read(
None // BIO mode has no deadline
};

// CRITICAL: Flush any pending TLS output before reading
// This ensures data from previous write() calls is sent before we wait for response.
// Without this, write() may leave data in pending_tls_output (if socket buffer was full),
// and read() would timeout waiting for a response that the server never received.
if !is_bio {
socket
.flush_pending_tls_output(vm, deadline)
.map_err(SslError::Py)?;
}

// Loop to handle TLS records and post-handshake messages
// Matches SSL_read behavior which loops until data is available
// - CPython uses OpenSSL's SSL_read which loops on SSL_ERROR_WANT_READ/WANT_WRITE
Expand Down
Loading