berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 9320df6339 into 3f9d88f859

This commit is contained in:
ngrondin 2025-07-02 15:47:49 +01:00 committed by GitHub
parent 3f9d88f859 9320df6339
commit d707f6808f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 60 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
actix-http/src/builder.rs
View File

@ -17,6 +17,7 @@ pub struct HttpServiceBuilder<T, S, X = ExpectHandler, U = UpgradeHandler> {
keep_alive: KeepAlive,
client_request_timeout: Duration,
client_disconnect_timeout: Duration,
max_buffer_size: Option<usize>,
secure: bool,
local_addr: Option<net::SocketAddr>,
expect: X,
@ -38,6 +39,7 @@ where
keep_alive: KeepAlive::default(),
client_request_timeout: Duration::from_secs(5),
client_disconnect_timeout: Duration::ZERO,
max_buffer_size: None,
secure: false,
local_addr: None,
@ -124,6 +126,15 @@ where
self.client_disconnect_timeout(dur)
}
/// Set maximum buffer size.
///
/// Defines the maximum size of the buffer. When the size is reached, the dispatcher
/// will flush the data to the IO streams
pub fn max_buffer_size(mut self, size: usize) -> Self {
self.max_buffer_size = Some(size);
self
}
/// Provide service for `EXPECT: 100-Continue` support.
///
/// Service get called with request that contains `EXPECT` header.
@ -140,6 +151,7 @@ where
keep_alive: self.keep_alive,
client_request_timeout: self.client_request_timeout,
client_disconnect_timeout: self.client_disconnect_timeout,
max_buffer_size: self.max_buffer_size,
secure: self.secure,
local_addr: self.local_addr,
expect: expect.into_factory(),
@ -164,6 +176,7 @@ where
keep_alive: self.keep_alive,
client_request_timeout: self.client_request_timeout,
client_disconnect_timeout: self.client_disconnect_timeout,
max_buffer_size: self.max_buffer_size,
secure: self.secure,
local_addr: self.local_addr,
expect: self.expect,
@ -199,6 +212,7 @@ where
self.keep_alive,
self.client_request_timeout,
self.client_disconnect_timeout,
self.max_buffer_size,
self.secure,
self.local_addr,
);
@ -224,6 +238,7 @@ where
self.keep_alive,
self.client_request_timeout,
self.client_disconnect_timeout,
self.max_buffer_size,
self.secure,
self.local_addr,
);
@ -246,6 +261,7 @@ where
self.keep_alive,
self.client_request_timeout,
self.client_disconnect_timeout,
self.max_buffer_size,
self.secure,
self.local_addr,
);

18
actix-http/src/config.rs
View File

@ -17,6 +17,7 @@ struct Inner {
keep_alive: KeepAlive,
client_request_timeout: Duration,
client_disconnect_timeout: Duration,
max_buffer_size: Option<usize>,
secure: bool,
local_addr: Option<std::net::SocketAddr>,
date_service: DateService,
@ -28,6 +29,7 @@ impl Default for ServiceConfig {
KeepAlive::default(),
Duration::from_secs(5),
Duration::ZERO,
None,
false,
None,
)
@ -40,6 +42,7 @@ impl ServiceConfig {
keep_alive: KeepAlive,
client_request_timeout: Duration,
client_disconnect_timeout: Duration,
max_buffer_size: Option<usize>,
secure: bool,
local_addr: Option<net::SocketAddr>,
) -> ServiceConfig {
@ -47,6 +50,7 @@ impl ServiceConfig {
keep_alive: keep_alive.normalize(),
client_request_timeout,
client_disconnect_timeout,
max_buffer_size,
secure,
local_addr,
date_service: DateService::new(),
@ -104,6 +108,10 @@ impl ServiceConfig {
self.0.date_service.now()
}
pub fn max_buffer_size(&self) -> Option<usize> {
self.0.max_buffer_size
}
/// Writes date header to `dst` buffer.
///
/// Low-level method that utilizes the built-in efficient date service, requiring fewer syscalls
@ -143,8 +151,14 @@ mod tests {
#[actix_rt::test]
async fn test_date_service_update() {
let settings =
ServiceConfig::new(KeepAlive::Os, Duration::ZERO, Duration::ZERO, false, None);
let settings = ServiceConfig::new(
KeepAlive::Os,
Duration::ZERO,
Duration::ZERO,
None,
false,
None,
);
yield_now().await;

6
actix-http/src/h1/dispatcher.rs
View File

@ -166,6 +166,7 @@ pin_project! {
pub(super) io: Option<T>,
read_buf: BytesMut,
write_buf: BytesMut,
max_buffer_size: usize,
codec: Codec,
}
}
@ -278,6 +279,7 @@ where
io: Some(io),
read_buf: BytesMut::with_capacity(HW_BUFFER_SIZE),
write_buf: BytesMut::with_capacity(HW_BUFFER_SIZE),
max_buffer_size: config.max_buffer_size().unwrap_or(MAX_BUFFER_SIZE),
codec: Codec::new(config),
},
},
@ -493,7 +495,7 @@ where
StateProj::SendPayload { mut body } => {
// keep populate writer buffer until buffer size limit hit,
// get blocked or finished.
while this.write_buf.len() < super::payload::MAX_BUFFER_SIZE {
while this.write_buf.len() < *this.max_buffer_size {
match body.as_mut().poll_next(cx) {
Poll::Ready(Some(Ok(item))) => {
this.codec
@ -532,7 +534,7 @@ where
// keep populate writer buffer until buffer size limit hit,
// get blocked or finished.
while this.write_buf.len() < super::payload::MAX_BUFFER_SIZE {
while this.write_buf.len() < *this.max_buffer_size {
match body.as_mut().poll_next(cx) {
Poll::Ready(Some(Ok(item))) => {
this.codec

9
actix-http/src/h1/dispatcher_tests.rs
View File

@ -82,6 +82,7 @@ async fn late_request() {
KeepAlive::Disabled,
Duration::from_millis(100),
Duration::ZERO,
None,
false,
None,
);
@ -149,6 +150,7 @@ async fn oneshot_connection() {
KeepAlive::Disabled,
Duration::from_millis(100),
Duration::ZERO,
None,
false,
None,
);
@ -210,6 +212,7 @@ async fn keep_alive_timeout() {
KeepAlive::Timeout(Duration::from_millis(200)),
Duration::from_millis(100),
Duration::ZERO,
None,
false,
None,
);
@ -289,6 +292,7 @@ async fn keep_alive_follow_up_req() {
KeepAlive::Timeout(Duration::from_millis(500)),
Duration::from_millis(100),
Duration::ZERO,
None,
false,
None,
);
@ -453,6 +457,7 @@ async fn pipelining_ok_then_ok() {
KeepAlive::Disabled,
Duration::from_millis(1),
Duration::from_millis(1),
None,
false,
None,
);
@ -523,6 +528,7 @@ async fn pipelining_ok_then_bad() {
KeepAlive::Disabled,
Duration::from_millis(1),
Duration::from_millis(1),
None,
false,
None,
);
@ -586,6 +592,7 @@ async fn expect_handling() {
KeepAlive::Disabled,
Duration::ZERO,
Duration::ZERO,
None,
false,
None,
);
@ -663,6 +670,7 @@ async fn expect_eager() {
KeepAlive::Disabled,
Duration::ZERO,
Duration::ZERO,
None,
false,
None,
);
@ -746,6 +754,7 @@ async fn upgrade_handling() {
KeepAlive::Disabled,
Duration::ZERO,
Duration::ZERO,
None,
false,
None,
);

15
actix-web/src/server.rs
View File

@ -31,6 +31,7 @@ struct Config {
keep_alive: KeepAlive,
client_request_timeout: Duration,
client_disconnect_timeout: Duration,
max_buffer_size: Option<usize>,
#[allow(dead_code)] // only dead when no TLS features are enabled
tls_handshake_timeout: Option<Duration>,
}
@ -116,6 +117,7 @@ where
keep_alive: KeepAlive::default(),
client_request_timeout: Duration::from_secs(5),
client_disconnect_timeout: Duration::from_secs(1),
max_buffer_size: None,
tls_handshake_timeout: None,
})),
backlog: 1024,
@ -234,6 +236,15 @@ where
self
}
/// Set maximum buffer size.
///
/// Defines the maximum size of the write buffer. When the size is reached, the dispatcher
/// will flush the data to the IO streams
pub fn max_buffer_size(self, size: usize) -> Self {
self.config.lock().unwrap().max_buffer_size = Some(size);
self
}
/// Sets TLS handshake timeout.
///
/// Defines a timeout for TLS handshake. If the TLS handshake does not complete within this
@ -560,6 +571,10 @@ where
.client_disconnect_timeout(cfg.client_disconnect_timeout)
.local_addr(addr);
if let Some(size) = cfg.max_buffer_size {
svc = svc.max_buffer_size(size);
};
if let Some(handler) = on_connect_fn.clone() {
svc =
svc.on_connect_ext(move |io: &_, ext: _| (handler)(io as &dyn Any, ext))