From 1710b14270c20064fca80c6c1bdf2a37f9dc742f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 09:14:20 +0000 Subject: [PATCH 1/2] build(deps): bump socket2 from 0.5.10 to 0.6.0 Bumps [socket2](https://github.com/rust-lang/socket2) from 0.5.10 to 0.6.0. - [Release notes](https://github.com/rust-lang/socket2/releases) - [Changelog](https://github.com/rust-lang/socket2/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/socket2/commits) --- updated-dependencies: - dependency-name: socket2 dependency-version: 0.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3e6979d0f..447c45497 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2388,7 +2388,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.0", "tokio", "tower-service", "tracing", @@ -3057,7 +3057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -3559,7 +3559,7 @@ dependencies = [ "mas-context", "pin-project-lite", "rustls-pemfile", - "socket2 0.5.10", + "socket2 0.6.0", "thiserror 2.0.12", "tokio", "tokio-rustls", diff --git a/Cargo.toml b/Cargo.toml index 183a516ce..d5040ac77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -609,7 +609,7 @@ version = "2.2.0" # Low-level socket manipulation [workspace.dependencies.socket2] -version = "0.5.10" +version = "0.6.0" # Subject Public Key Info [workspace.dependencies.spki] From 62b9874d6eeeaebd057dbe7553822aa262f405e8 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Wed, 30 Jul 2025 11:24:04 +0200 Subject: [PATCH 2/2] Use the renamed functions from socket2 --- crates/listener/src/unix_or_tcp.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/listener/src/unix_or_tcp.rs b/crates/listener/src/unix_or_tcp.rs index 979a430fd..5cd85c441 100644 --- a/crates/listener/src/unix_or_tcp.rs +++ b/crates/listener/src/unix_or_tcp.rs @@ -160,7 +160,7 @@ impl UnixOrTcpListener { let socket = socket2::SockRef::from(&stream); socket.set_keepalive(true)?; - socket.set_nodelay(true)?; + socket.set_tcp_nodelay(true)?; Ok((remote_addr.into(), UnixOrTcpConnection::Tcp { stream })) } @@ -198,7 +198,7 @@ impl UnixOrTcpListener { let socket = socket2::SockRef::from(&stream); socket.set_keepalive(true)?; - socket.set_nodelay(true)?; + socket.set_tcp_nodelay(true)?; Poll::Ready(Ok(( remote_addr.into(),