Merge 2bbf0004fd into cede0c6dbb

Merge branch 'master' into fix/pending-stream-drop
fix actix#1313
2025-03-10 14:58:04 -07:00 · 2022-11-18 14:04:11 +01:00 · 2022-09-16 23:59:01 +02:00 · 2022-09-16 23:59:01 +02:00
2 changed files with 4 additions and 1 deletions
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@ -132,8 +132,10 @@
 ### Fixed

 - Avoid possibility of dispatcher getting stuck while back-pressuring I/O. [#2369]
+- Fix pending stream drop [#2830]

 [#2369]: https://github.com/actix/actix-web/pull/2369
+[#2830]: https://github.com/actix/actix-web/pull/2830

 ## 3.2.1

--- a/actix-http/src/h1/dispatcher.rs
+++ b/actix-http/src/h1/dispatcher.rs
@ -1182,7 +1182,8 @@ where
                    let state_is_none = inner_p.state.is_none();

                    // read half is closed; we do not process any responses
-                    if inner_p.flags.contains(Flags::READ_DISCONNECT) && state_is_none {
+                    // fix https://github.com/actix/actix-web/issues/1313
+                    if inner_p.flags.contains(Flags::READ_DISCONNECT) {
                        trace!("read half closed; start shutdown");
                        inner_p.flags.insert(Flags::SHUTDOWN);
                    }
Author	SHA1	Message	Date
simorex80	5a2b1fc7ec	Merge `2bbf0004fd` into `cede0c6dbb`	2025-03-10 14:58:04 -07:00
simorex80	2bbf0004fd	Merge branch 'master' into fix/pending-stream-drop	2022-11-18 14:04:11 +01:00
simorex80	7452ef252f	fix actix#1313	2022-09-16 23:59:01 +02:00
Simone Di Luzio	4a468b85b2	fix https://github.com/actix/actix-web/issues/1313	2022-09-16 23:59:01 +02:00