actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-24 00:21:08 +01:00
Code Issues Releases Wiki Activity

Enforce HW_BUFFER_SIZE inside h1::dispatcher (#1550)

Browse Source
This commit is contained in:
Andrew 2020-06-17 00:58:23 -07:00 committed by GitHub
parent 4f9a1ac3b7
commit e72ee28232
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES.md
View File

@ -1,5 +1,11 @@
# Changes # Changes
## [Unreleased]
### Changed
* Fix actix_http::h1::dispatcher so it returns when HW_BUFFER_SIZE is reached. Should reduce peak memory consumption during large uploads. [#1550]
## [3.0.0-alpha.3] - 2020-05-21 ## [3.0.0-alpha.3] - 2020-05-21
### Added ### Added

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

@ -861,7 +861,14 @@ where
T: AsyncRead + Unpin, T: AsyncRead + Unpin,
{ {
let mut read_some = false; let mut read_some = false;
loop { loop {
// If buf is full return but do not disconnect since
// there is more reading to be done
if buf.len() >= HW_BUFFER_SIZE {
return Ok(Some(false));
}
let remaining = buf.capacity() - buf.len(); let remaining = buf.capacity() - buf.len();
if remaining < LW_BUFFER_SIZE { if remaining < LW_BUFFER_SIZE {
buf.reserve(HW_BUFFER_SIZE - remaining); buf.reserve(HW_BUFFER_SIZE - remaining);