Cargo.lock

@@ -71,7 +71,7 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.11.2"
+version = "3.11.1"
 dependencies = [
  "actix-codec",
  "actix-http-test",
@@ -620,7 +620,7 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "awc"
-version = "3.8.1"
+version = "3.8.0"
 dependencies = [
  "actix-codec",
  "actix-http",

actix-http/CHANGES.md

@@ -2,12 +2,9 @@
 
 ## Unreleased
 
-## 3.11.2
-
 - Properly wake Payload receivers when feeding errors or EOF.
 - Add `ServiceConfigBuilder` type to facilitate future configuration extensions.
 - Add a configuration option to allow/disallow half closed connections in HTTP/1. This defaults to allow, reverting the change made in 3.11.1.
-- Shutdown connections when HTTP Responses are written without reading full Requests.
 
 ## 3.11.1
 

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "3.11.2"
+version = "3.11.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
 description = "HTTP types and services for the Actix ecosystem"
 keywords = ["actix", "http", "framework", "async", "futures"]

actix-http/README.md

@@ -5,11 +5,11 @@
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http)
-[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.11.2)](https://docs.rs/actix-http/3.11.2)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.11.1)](https://docs.rs/actix-http/3.11.1)
 ![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-http/3.11.2/status.svg)](https://deps.rs/crate/actix-http/3.11.2)
+[![dependency status](https://deps.rs/crate/actix-http/3.11.1/status.svg)](https://deps.rs/crate/actix-http/3.11.1)
 [![Download](https://img.shields.io/crates/d/actix-http.svg)](https://crates.io/crates/actix-http)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

actix-http/src/h1/dispatcher.rs

@@ -386,14 +386,7 @@ where
         let mut this = self.project();
         this.state.set(match size {
             BodySize::None | BodySize::Sized(0) => {
-                let payload_unfinished = this.payload.is_some();
-
-                if payload_unfinished {
-                    this.flags.insert(Flags::SHUTDOWN | Flags::FINISHED);
-                } else {
                 this.flags.insert(Flags::FINISHED);
-                }
-
                 State::None
             }
             _ => State::SendPayload { body },
@@ -411,14 +404,7 @@ where
         let mut this = self.project();
         this.state.set(match size {
             BodySize::None | BodySize::Sized(0) => {
-                let payload_unfinished = this.payload.is_some();
-
-                if payload_unfinished {
-                    this.flags.insert(Flags::SHUTDOWN | Flags::FINISHED);
-                } else {
                 this.flags.insert(Flags::FINISHED);
-                }
-
                 State::None
             }
             _ => State::SendErrorPayload { body },
@@ -517,22 +503,10 @@ where
                             Poll::Ready(None) => {
                                 this.codec.encode(Message::Chunk(None), this.write_buf)?;
 
-                                // if we have not yet pipelined to the next request, then
-                                // this.payload was the payload for the request we just finished
-                                // responding to. We can check to see if we finished reading it
-                                // yet, and if not, shutdown the connection.
-                                let payload_unfinished = this.payload.is_some();
-                                let not_pipelined = this.messages.is_empty();
-
                                 // payload stream finished.
                                 // set state to None and handle next message
                                 this.state.set(State::None);
-
-                                if not_pipelined && payload_unfinished {
-                                    this.flags.insert(Flags::SHUTDOWN | Flags::FINISHED);
-                                } else {
                                 this.flags.insert(Flags::FINISHED);
-                                }
 
                                 continue 'res;
                             }
@@ -568,22 +542,10 @@ where
                             Poll::Ready(None) => {
                                 this.codec.encode(Message::Chunk(None), this.write_buf)?;
 
-                                // if we have not yet pipelined to the next request, then
+                                // payload stream finished
-                                // this.payload was the payload for the request we just finished
-                                // responding to. We can check to see if we finished reading it
-                                // yet, and if not, shutdown the connection.
-                                let payload_unfinished = this.payload.is_some();
-                                let not_pipelined = this.messages.is_empty();
-
-                                // payload stream finished.
                                 // set state to None and handle next message
                                 this.state.set(State::None);
-
-                                if not_pipelined && payload_unfinished {
-                                    this.flags.insert(Flags::SHUTDOWN | Flags::FINISHED);
-                                } else {
                                 this.flags.insert(Flags::FINISHED);
-                                }
 
                                 continue 'res;
                             }

actix-http/src/h1/dispatcher_tests.rs

@@ -535,73 +535,6 @@ async fn pipelining_ok_then_ok() {
     .await;
 }
 
-#[actix_rt::test]
-async fn early_response_with_payload_closes_connection() {
-    lazy(|cx| {
-        let buf = TestBuffer::new(
-            "\
-                GET /unfinished HTTP/1.1\r\n\
-                Content-Length: 2\r\n\
-                \r\n\
-                ",
-        );
-
-        let cfg = ServiceConfig::new(
-            KeepAlive::Os,
-            Duration::from_millis(1),
-            Duration::from_millis(1),
-            false,
-            None,
-        );
-
-        let services = HttpFlow::new(echo_path_service(), ExpectHandler, None);
-
-        let h1 = Dispatcher::<_, _, _, _, UpgradeHandler>::new(
-            buf.clone(),
-            services,
-            cfg,
-            None,
-            OnConnectData::default(),
-        );
-
-        pin!(h1);
-
-        assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
-
-        match h1.as_mut().poll(cx) {
-            Poll::Pending => panic!("Should have shut down"),
-            Poll::Ready(res) => assert!(res.is_ok()),
-        }
-
-        // polls: initial => shutdown
-        assert_eq!(h1.poll_count, 2);
-
-        {
-            let mut res = buf.write_buf_slice_mut();
-            stabilize_date_header(&mut res);
-            let res = &res[..];
-
-            let exp = b"\
-                HTTP/1.1 200 OK\r\n\
-                content-length: 11\r\n\
-                date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\r\n\
-                /unfinished\
-                ";
-
-            assert_eq!(
-                res,
-                exp,
-                "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-                String::from_utf8_lossy(res),
-                String::from_utf8_lossy(exp)
-            );
-        }
-    })
-    .await;
-}
-
 #[actix_rt::test]
 async fn pipelining_ok_then_bad() {
     lazy(|cx| {

awc/CHANGES.md

@@ -2,10 +2,6 @@
 
 ## Unreleased
 
-## 3.8.1
-
-- Fix a bug where `GO_AWAY` errors did not stop connections from returning to the pool.
-
 ## 3.8.0
 
 - Add `hickory-dns` crate feature (off-by-default).

awc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "3.8.1"
+version = "3.8.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Async HTTP and WebSocket client library"
 keywords = ["actix", "http", "framework", "async", "web"]

awc/README.md

@@ -5,9 +5,9 @@
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/awc?label=latest)](https://crates.io/crates/awc)
-[![Documentation](https://docs.rs/awc/badge.svg?version=3.8.1)](https://docs.rs/awc/3.8.1)
+[![Documentation](https://docs.rs/awc/badge.svg?version=3.8.0)](https://docs.rs/awc/3.8.0)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/awc)
-[![Dependency Status](https://deps.rs/crate/awc/3.8.1/status.svg)](https://deps.rs/crate/awc/3.8.1)
+[![Dependency Status](https://deps.rs/crate/awc/3.8.0/status.svg)](https://deps.rs/crate/awc/3.8.0)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
 <!-- prettier-ignore-end -->

awc/src/client/h2proto.rs

@@ -107,7 +107,7 @@ where
 
     let res = poll_fn(|cx| io.poll_ready(cx)).await;
     if let Err(err) = res {
-        io.on_release(err.is_io() || err.is_go_away());
+        io.on_release(err.is_io());
         return Err(SendRequestError::from(err));
     }
 
@@ -121,7 +121,7 @@ where
             fut.await.map_err(SendRequestError::from)?
         }
         Err(err) => {
-            io.on_release(err.is_io() || err.is_go_away());
+            io.on_release(err.is_io());
             return Err(err.into());
         }
     };