From 4a468b85b291243eae390f1ad34f24f7e4f67f6e Mon Sep 17 00:00:00 2001
From: Simone Di Luzio <s.diluzio@crif.com>
Date: Sun, 24 Jul 2022 00:08:20 +0200
Subject: [PATCH 1/2] fix https://github.com/actix/actix-web/issues/1313
---
actix-http/src/h1/dispatcher.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/actix-http/src/h1/dispatcher.rs b/actix-http/src/h1/dispatcher.rs
index 81090667d..3267c2aed 100644
--- a/actix-http/src/h1/dispatcher.rs
+++ b/actix-http/src/h1/dispatcher.rs
@@ -1197,7 +1197,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);
}
From 7452ef252f69660ccda0efbaf1b3a36721077fbe Mon Sep 17 00:00:00 2001
From: simorex80 <simorex@gmail.com>
Date: Mon, 8 Aug 2022 10:12:00 +0200
Subject: [PATCH 2/2] fix actix#1313
---
actix-http/CHANGES.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index 816d4b71f..b093389d8 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -14,8 +14,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 - 2022-07-02