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

Avoid possibility of dispatcher getting stuck while backpressuring io

This commit is contained in:
Thales Fragoso 2021-08-19 16:21:28 -03:00
parent 53ec66caf4
commit bef6ab45ef
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actix-http/CHANGES.md
View File

@ -9,12 +9,13 @@
* Remove slice creation pointing to potential uninitialized data on h1 encoder. [#2364] * Remove slice creation pointing to potential uninitialized data on h1 encoder. [#2364]
* Remove `Into<Error>` bound on `Encoder` body types. [#2375] * Remove `Into<Error>` bound on `Encoder` body types. [#2375]
* Fix quality parse error in Accept-Encoding header. [#2344] * Fix quality parse error in Accept-Encoding header. [#2344]
* Avoid possibility of dispatcher getting stuck while backpressuring io. [#2369]
[#2364]: https://github.com/actix/actix-web/pull/2364 [#2364]: https://github.com/actix/actix-web/pull/2364
[#2375]: https://github.com/actix/actix-web/pull/2375 [#2375]: https://github.com/actix/actix-web/pull/2375
[#2344]: https://github.com/actix/actix-web/pull/2344 [#2344]: https://github.com/actix/actix-web/pull/2344
[#2377]: https://github.com/actix/actix-web/pull/2377 [#2377]: https://github.com/actix/actix-web/pull/2377
[#2369]: https://github.com/actix/actix-web/pull/2369
## 3.0.0-beta.8 - 2021-08-09 ## 3.0.0-beta.8 - 2021-08-09
### Fixed ### Fixed

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

@ -842,10 +842,13 @@ where
A Request head too large to parse is only checked on A Request head too large to parse is only checked on
httparse::Status::Partial condition. httparse::Status::Partial condition.
*/ */
if this.payload.is_none() { match this.payload {
/* /*
When dispatcher has a payload the responsibility of When dispatcher has a payload the responsibility of
wake up it would be shift to h1::payload::Payload. wake up it would be shift to h1::payload::Payload.
Unless the payload is ready to read, in which case
it might not have access to the waker and could
result in the dispatcher getting stuck until timeout.
Reason: Reason:
Self wake up when there is payload would waste poll Self wake up when there is payload would waste poll
@ -857,9 +860,9 @@ where
At this case read_buf could always remain beyond At this case read_buf could always remain beyond
MAX_BUFFER_SIZE and self wake up would be busy poll MAX_BUFFER_SIZE and self wake up would be busy poll
dispatcher and waste resource. dispatcher and waste resource.
*/ */
cx.waker().wake_by_ref(); Some(ref p) if p.need_read(cx) != PayloadStatus::Read => {}
_ => cx.waker().wake_by_ref(),
} }
return Ok(false); return Ok(false);