Merge afad1db343 into e1da110e92

* chore: Export EitherExtractError for public use

* refactor: export EitherExtractError

actix-http/CHANGES.md

@@ -45,6 +45,10 @@
 
 - Add `error::InvalidStatusCode` re-export.
 
+### Fixed
+
+- Fix `MessageType::set_headers` not using the correct payload decoder when Transfer-Encoding and Content-Length are absent.
+
 ## 3.7.0
 
 ### Added

actix-http/src/h1/decoder.rs

@@ -391,8 +391,20 @@ impl MessageType for ResponseHead {
             // switching protocol or connect
             PayloadType::Stream(PayloadDecoder::eof())
         } else {
-            // for HTTP/1.0 read to eof and close connection
+            let body_allowed = match msg.status.as_u16() {
-            if msg.version == Version::HTTP_10 {
+                100..=199 => false,
+                204 => false,
+                304 => false,
+                _ => true,
+            };
+            // for HTTP/1.0 and HTTP/1.1 read to eof and close connection
+            if msg.version == Version::HTTP_11 && body_allowed {
+                if let Some(ConnectionType::Close) = msg.conn_type() {
+                    PayloadType::Payload(PayloadDecoder::eof())
+                } else {
+                    PayloadType::None
+                }
+            } else if msg.version == Version::HTTP_10 {
                 msg.set_connection_type(ConnectionType::Close);
                 PayloadType::Payload(PayloadDecoder::eof())
             } else {

actix-web/CHANGES.md

@@ -5,6 +5,7 @@
 - `actix_web::response::builder::HttpResponseBuilder::streaming()` now sets `Content-Type` to `application/octet-stream` if `Content-Type` does not exist.
 - `actix_web::response::builder::HttpResponseBuilder::streaming()` now calls `actix_web::response::builder::HttpResponseBuilder::no_chunking()` if `Content-Length` is set by user.
 - Add `ws` crate feature (on-by-default) which forwards to `actix-http` and guards some of its `ResponseError` impls.
+- Add public export for `EitherExtractError` in `error` module.
 
 ## 4.11.0
 

actix-web/src/error/mod.rs

@@ -21,6 +21,7 @@ mod response_error;
 
 pub(crate) use self::macros::{downcast_dyn, downcast_get_type_id};
 pub use self::{error::Error, internal::*, response_error::ResponseError};
+pub use crate::types::EitherExtractError;
 
 /// A convenience [`Result`](std::result::Result) for Actix Web operations.
 ///

actix-web/src/types/mod.rs

@@ -11,7 +11,7 @@ mod query;
 mod readlines;
 
 pub use self::{
-    either::Either,
+    either::{Either, EitherExtractError},
     form::{Form, FormConfig, UrlEncoded},
     header::Header,
     html::Html,

awc/tests/test_client.rs

@@ -749,7 +749,7 @@ async fn client_unread_response() {
 
     // awc does not read all bytes unless content-length is specified
     let bytes = res.body().await.unwrap();
-    assert_eq!(bytes, Bytes::from_static(b""));
+    assert_eq!(bytes, Bytes::from_static(b"welcome!"));
 }
 
 #[actix_rt::test]