push.rocks/smartproxy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(rustproxy-http): avoid reusing HTTP/1 senders during streaming responses and relax HTTP/2 keep-alive timeouts

Browse Source
This commit is contained in:
Jürgen Kunz
2026-03-15 16:58:41 +00:00
parent d598bffec3
commit da26816af5
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rust/crates/rustproxy-http/src/proxy_service.rs
View File

@@ -910,8 +910,15 @@ impl HttpProxyService {
}
};
// Return sender to pool (body streams lazily, sender is reusable once response head is received)
self.connection_pool.checkin_h1(pool_key.clone(), sender);
// Note: we do NOT return the sender to the pool here because the response body
// hasn't been fully streamed yet. Pooling a sender while its response body is still
// in-flight risks another request being dispatched on the same connection if is_ready()
// momentarily returns true between chunks. The sender is dropped after this scope,
// and the backend connection remains alive via the spawned conn driver task until
// the response body finishes streaming.
// For small/empty responses, the sender could theoretically be reused, but the safety
// of large streaming responses (e.g. 352MB Docker layers) takes priority.
drop(sender);
self.build_streaming_response(upstream_response, route, route_id, source_ip, conn_activity).await
}
@@ -939,7 +946,7 @@ impl HttpProxyService {
h2_builder
.timer(hyper_util::rt::TokioTimer::new())
.keep_alive_interval(std::time::Duration::from_secs(10))
.keep_alive_timeout(std::time::Duration::from_secs(5))
.keep_alive_timeout(std::time::Duration::from_secs(30))
.initial_stream_window_size(2 * 1024 * 1024)
.initial_connection_window_size(16 * 1024 * 1024);
let (sender, conn): (
@@ -1082,7 +1089,7 @@ impl HttpProxyService {
h2_builder
.timer(hyper_util::rt::TokioTimer::new())
.keep_alive_interval(std::time::Duration::from_secs(10))
.keep_alive_timeout(std::time::Duration::from_secs(5))
.keep_alive_timeout(std::time::Duration::from_secs(30))
.initial_stream_window_size(2 * 1024 * 1024)
.initial_connection_window_size(16 * 1024 * 1024);
let (mut sender, conn): (
@@ -1178,7 +1185,7 @@ impl HttpProxyService {
h2_builder
.timer(hyper_util::rt::TokioTimer::new())
.keep_alive_interval(std::time::Duration::from_secs(10))
.keep_alive_timeout(std::time::Duration::from_secs(5))
.keep_alive_timeout(std::time::Duration::from_secs(30))
.initial_stream_window_size(2 * 1024 * 1024)
.initial_connection_window_size(16 * 1024 * 1024);
let handshake_result = tokio::time::timeout(
@@ -1425,8 +1432,8 @@ impl HttpProxyService {
}
};
// Return sender to pool for keep-alive reuse
self.connection_pool.checkin_h1(pool_key.clone(), sender);
// Don't pool the sender while response body is still streaming (same safety as forward_h1_with_sender)
drop(sender);
self.build_streaming_response(upstream_response, route, route_id, source_ip, conn_activity).await
}