Merge bb2c6cebfd into d119500f93

Cargo.lock

@@ -345,7 +345,7 @@ dependencies = [
 
 [[package]]
 name = "actix-web"
-version = "4.11.0"
+version = "4.12.0"
 dependencies = [
  "actix-codec",
  "actix-files",

actix-web/CHANGES.md

@@ -2,8 +2,10 @@
 
 ## Unreleased
 
+## 4.12.0
+
 - `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.
+- `actix_web::response::builder::HttpResponseBuilder::streaming()` now calls `actix_web::response::builder::HttpResponseBuilder::no_chunking()` and returns `SizedStream` 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.
 

actix-web/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "4.11.0"
+version = "4.12.0"
 description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
 keywords = ["actix", "http", "web", "framework", "async"]

actix-web/README.md

@@ -8,10 +8,10 @@
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
-[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.11.0)](https://docs.rs/actix-web/4.11.0)
+[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.12.0)](https://docs.rs/actix-web/4.12.0)
 ![MSRV](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
-[![Dependency Status](https://deps.rs/crate/actix-web/4.11.0/status.svg)](https://deps.rs/crate/actix-web/4.11.0)
+[![Dependency Status](https://deps.rs/crate/actix-web/4.12.0/status.svg)](https://deps.rs/crate/actix-web/4.12.0)
 <br />
 [![CI](https://github.com/actix/actix-web/actions/workflows/ci.yml/badge.svg)](https://github.com/actix/actix-web/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/actix/actix-web/graph/badge.svg?token=dSwOnp9QCv)](https://codecov.io/gh/actix/actix-web)

actix-web/src/middleware/compress.rs

@@ -110,14 +110,22 @@ where
 
     #[allow(clippy::borrow_interior_mutable_const)]
     fn call(&self, req: ServiceRequest) -> Self::Future {
+        if req.extensions().get::<Encoding>().is_some() {
+            return Either::left(CompressResponse {
+                fut: self.service.call(req),
+                _phantom: PhantomData,
+            });
+        }
+
         // negotiate content-encoding
         let accept_encoding = req.get_header::<AcceptEncoding>();
 
         let accept_encoding = match accept_encoding {
             // missing header; fallback to identity
             None => {
+                req.extensions_mut().insert::<Encoding>(Encoding::identity());
+
                 return Either::left(CompressResponse {
-                    encoding: Encoding::identity(),
                     fut: self.service.call(req),
                     _phantom: PhantomData,
                 })
@@ -143,11 +151,14 @@ where
                     .map_into_right_body()))
             }
 
-            Some(encoding) => Either::left(CompressResponse {
+            Some(encoding) => {
-                fut: self.service.call(req),
+                req.extensions_mut().insert::<Encoding>(encoding);
-                encoding,
+
-                _phantom: PhantomData,
+                Either::left(CompressResponse {
-            }),
+                    fut: self.service.call(req),
+                    _phantom: PhantomData,
+                })
+            },
         }
     }
 }
@@ -159,7 +170,6 @@ pin_project! {
     {
         #[pin]
         fut: S::Future,
-        encoding: Encoding,
         _phantom: PhantomData<B>,
     }
 }
@@ -176,8 +186,19 @@ where
 
         match ready!(this.fut.poll(cx)) {
             Ok(resp) => {
-                let enc = match this.encoding {
+                let request_encoding = resp.request().extensions().get::<Encoding>().cloned();
-                    Encoding::Known(enc) => *enc,
+
+                let encoding = match request_encoding {
+                    Some(enc) => enc.clone(),
+                    None => {
+                        return Poll::Ready(Ok(resp.map_body(move |head, body| {
+                            EitherBody::left(Encoder::response(ContentEncoding::Identity, head, body))
+                        })));
+                    }
+                };
+
+                let enc = match encoding {
+                    Encoding::Known(enc) => enc,
                     Encoding::Unknown(enc) => {
                         unimplemented!("encoding '{enc}' should not be here");
                     }

actix-web/src/response/builder.rs

@@ -11,7 +11,7 @@ use futures_core::Stream;
 use serde::Serialize;
 
 use crate::{
-    body::{BodyStream, BoxBody, MessageBody},
+    body::{BodyStream, BoxBody, MessageBody, SizedStream},
     dev::Extensions,
     error::{Error, JsonPayloadError},
     http::{
@@ -335,17 +335,18 @@ impl HttpResponseBuilder {
             }
         }
 
-        if let Some(parts) = self.inner() {
+        let content_length = self
-            if let Some(length) = parts.headers.get(header::CONTENT_LENGTH) {
+            .inner()
-                if let Ok(length) = length.to_str() {
+            .and_then(|parts| parts.headers.get(header::CONTENT_LENGTH))
-                    if let Ok(length) = length.parse::<u64>() {
+            .and_then(|value| value.to_str().ok())
-                        self.no_chunking(length);
+            .and_then(|value| value.parse::<u64>().ok());
-                    }
-                }
-            }
-        }
 
-        self.body(BodyStream::new(stream))
+        if let Some(len) = content_length {
+            self.no_chunking(len);
+            self.body(SizedStream::new(len, stream))
+        } else {
+            self.body(BodyStream::new(stream))
+        }
     }
 
     /// Set a JSON body and build the `HttpResponse`.