Skip to content

native tls handshake: build TlsConnector in blocking threadpool #4027

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
merged 2 commits into from
Sep 23, 2025
Merged

native tls handshake: build TlsConnector in blocking threadpool #4027

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3eec5eb
build TlsConnector in blocking threadpool
Sep 18, 2025
976d42a
Update sqlx-core/src/net/tls/tls_native_tls.rs
abonander Sep 19, 2025
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
7 changes: 6 additions & 1 deletion sqlx-core/src/net/tls/tls_native_tls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use crate::io::ReadBuf;
use crate::net::tls::util::StdSocket;
use crate::net::tls::TlsConfig;
use crate::net::Socket;
use crate::rt;
use crate::Error;

use native_tls::{HandshakeError, Identity};
Expand Down Expand Up @@ -61,7 +62,11 @@ pub async fn handshake<S: Socket>(
builder.identity(identity);
}

let connector = builder.build().map_err(Error::tls)?;
// The openssl TlsConnector synchronously loads certificates from files.
// Loading these files can block for tens of milliseconds.
let connector = rt::spawn_blocking(move || builder.build())
.await
.map_err(Error::tls)?;

let mut mid_handshake = match connector.connect(config.hostname, StdSocket::new(socket)) {
Ok(tls_stream) => return Ok(NativeTlsSocket { stream: tls_stream }),
Expand Down
Loading