Merge 6a8b4f7ffe into aeb42486af

.clippy.toml

@@ -3,6 +3,6 @@ disallowed-names = [
   "e", # no single letter error bindings
 ]
 disallowed-methods = [
-  { path = "std::cell::RefCell::default()", reason = "prefer explicit inner type default (remove allow-invalid when rust-lang/rust-clippy/#8581 is fixed)", allow-invalid = true },
-  { path = "std::rc::Rc::default()", reason = "prefer explicit inner type default (remove allow-invalid when rust-lang/rust-clippy/#8581 is fixed)", allow-invalid = true },
+  { path = "std::cell::RefCell::default()", reason = "prefer explicit inner type default" },
+  { path = "std::rc::Rc::default()", reason = "prefer explicit inner type default" },
 ]

.cspell.yml

@@ -9,5 +9,4 @@ words:
   - rustls
   - rustup
   - serde
-  - uring
   - zstd

.github/workflows/ci-post-merge.yml

@@ -44,12 +44,12 @@ jobs:
           echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
 
       - name: Install Rust (${{ matrix.version.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # v1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
         with:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@f63c33fd96cc1e69a29bafd06541cf28588b43a4 # v2.58.21
+        uses: taiki-e/install-action@ad95d4e02e061d4390c4b66ef5ed56c7fee3d2ce # v2.58.17
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -80,10 +80,10 @@ jobs:
         uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # v1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
 
       - name: Install just, cargo-hack
-        uses: taiki-e/install-action@f63c33fd96cc1e69a29bafd06541cf28588b43a4 # v2.58.21
+        uses: taiki-e/install-action@ad95d4e02e061d4390c4b66ef5ed56c7fee3d2ce # v2.58.17
         with:
           tool: just,cargo-hack
 

.github/workflows/ci.yml

@@ -59,12 +59,12 @@ jobs:
         uses: rui314/setup-mold@7344740a9418dcdcb481c7df83d9fbd1d5072d7d # v1
 
       - name: Install Rust (${{ matrix.version.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # v1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
         with:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@f63c33fd96cc1e69a29bafd06541cf28588b43a4 # v2.58.21
+        uses: taiki-e/install-action@ad95d4e02e061d4390c4b66ef5ed56c7fee3d2ce # v2.58.17
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -92,7 +92,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # v1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
         with:
           toolchain: nightly
 
@@ -108,12 +108,12 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # v1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
         with:
           toolchain: nightly
 
       - name: Install just
-        uses: taiki-e/install-action@f63c33fd96cc1e69a29bafd06541cf28588b43a4 # v2.58.21
+        uses: taiki-e/install-action@ad95d4e02e061d4390c4b66ef5ed56c7fee3d2ce # v2.58.17
         with:
           tool: just
 

.github/workflows/coverage.yml

@@ -18,13 +18,13 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # v1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
         with:
           toolchain: nightly
           components: llvm-tools
 
       - name: Install just, cargo-llvm-cov, cargo-nextest
-        uses: taiki-e/install-action@f63c33fd96cc1e69a29bafd06541cf28588b43a4 # v2.58.21
+        uses: taiki-e/install-action@ad95d4e02e061d4390c4b66ef5ed56c7fee3d2ce # v2.58.17
         with:
           tool: just,cargo-llvm-cov,cargo-nextest
 
@@ -32,7 +32,7 @@ jobs:
         run: just test-coverage-codecov
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
         with:
           files: codecov.json
           fail_ci_if_error: true

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # v1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
         with:
           toolchain: nightly
           components: rustfmt
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # v1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
         with:
           components: clippy
 
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # v1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
         with:
           toolchain: nightly
           components: rust-docs
@@ -72,12 +72,12 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Install Rust (${{ vars.RUST_VERSION_EXTERNAL_TYPES }})
-        uses: actions-rust-lang/setup-rust-toolchain@ab6845274e2ff01cd4462007e1a9d9df1ab49f42 # v1.14.0
+        uses: actions-rust-lang/setup-rust-toolchain@fb51252c7ba57d633bc668f941da052e410add48 # v1.13.0
         with:
           toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
 
       - name: Install just
-        uses: taiki-e/install-action@f63c33fd96cc1e69a29bafd06541cf28588b43a4 # v2.58.21
+        uses: taiki-e/install-action@ad95d4e02e061d4390c4b66ef5ed56c7fee3d2ce # v2.58.17
         with:
           tool: just
 

actix-files/CHANGES.md

@@ -2,9 +2,6 @@
 
 ## Unreleased
 
-## 0.6.7
-
-- Add `{Files, NamedFile}::read_mode_threshold()` methods to allow faster synchronous reads of small files.
 - Minimum supported Rust version (MSRV) is now 1.75.
 
 ## 0.6.6

actix-files/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-files"
-version = "0.6.7"
+version = "0.6.6"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
 description = "Static file serving for Actix Web"
 keywords = ["actix", "http", "async", "futures"]

actix-files/README.md

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

actix-files/src/chunked.rs

@@ -14,12 +14,6 @@ use pin_project_lite::pin_project;
 
 use super::named::File;
 
-#[derive(Debug, Clone, Copy)]
-pub(crate) enum ReadMode {
-    Sync,
-    Async,
-}
-
 pin_project! {
     /// Adapter to read a `std::file::File` in chunks.
     #[doc(hidden)]
@@ -30,7 +24,6 @@ pin_project! {
         state: ChunkedReadFileState<Fut>,
         counter: u64,
         callback: F,
-        read_mode: ReadMode,
     }
 }
 
@@ -64,7 +57,6 @@ pub(crate) fn new_chunked_read(
     size: u64,
     offset: u64,
     file: File,
-    read_mode_threshold: u64,
 ) -> impl Stream<Item = Result<Bytes, Error>> {
     ChunkedReadFile {
         size,
@@ -77,50 +69,31 @@ pub(crate) fn new_chunked_read(
         },
         counter: 0,
         callback: chunked_read_file_callback,
-        read_mode: if size < read_mode_threshold {
-            ReadMode::Sync
-        } else {
-            ReadMode::Async
-        },
     }
 }
 
 #[cfg(not(feature = "experimental-io-uring"))]
-fn chunked_read_file_callback_sync(
+async fn chunked_read_file_callback(
     mut file: File,
     offset: u64,
     max_bytes: usize,
-) -> Result<(File, Bytes), io::Error> {
+) -> Result<(File, Bytes), Error> {
     use io::{Read as _, Seek as _};
 
-    let mut buf = Vec::with_capacity(max_bytes);
+    let res = actix_web::web::block(move || {
+        let mut buf = Vec::with_capacity(max_bytes);
 
-    file.seek(io::SeekFrom::Start(offset))?;
+        file.seek(io::SeekFrom::Start(offset))?;
 
-    let n_bytes = file.by_ref().take(max_bytes as u64).read_to_end(&mut buf)?;
+        let n_bytes = file.by_ref().take(max_bytes as u64).read_to_end(&mut buf)?;
 
-    if n_bytes == 0 {
-        Err(io::Error::from(io::ErrorKind::UnexpectedEof))
-    } else {
-        Ok((file, Bytes::from(buf)))
-    }
-}
-
-#[cfg(not(feature = "experimental-io-uring"))]
-#[inline]
-async fn chunked_read_file_callback(
-    file: File,
-    offset: u64,
-    max_bytes: usize,
-    read_mode: ReadMode,
-) -> Result<(File, Bytes), Error> {
-    let res = match read_mode {
-        ReadMode::Sync => chunked_read_file_callback_sync(file, offset, max_bytes)?,
-        ReadMode::Async => {
-            actix_web::web::block(move || chunked_read_file_callback_sync(file, offset, max_bytes))
-                .await??
+        if n_bytes == 0 {
+            Err(io::Error::from(io::ErrorKind::UnexpectedEof))
+        } else {
+            Ok((file, Bytes::from(buf)))
         }
-    };
+    })
+    .await??;
 
     Ok(res)
 }
@@ -198,7 +171,7 @@ where
 #[cfg(not(feature = "experimental-io-uring"))]
 impl<F, Fut> Stream for ChunkedReadFile<F, Fut>
 where
-    F: Fn(File, u64, usize, ReadMode) -> Fut,
+    F: Fn(File, u64, usize) -> Fut,
     Fut: Future<Output = Result<(File, Bytes), Error>>,
 {
     type Item = Result<Bytes, Error>;
@@ -220,7 +193,7 @@ where
                         .take()
                         .expect("ChunkedReadFile polled after completion");
 
-                    let fut = (this.callback)(file, offset, max_bytes, *this.read_mode);
+                    let fut = (this.callback)(file, offset, max_bytes);
 
                     this.state
                         .project_replace(ChunkedReadFileState::Future { fut });

actix-files/src/files.rs

@@ -49,7 +49,6 @@ pub struct Files {
     use_guards: Option<Rc<dyn Guard>>,
     guards: Vec<Rc<dyn Guard>>,
     hidden_files: bool,
-    read_mode_threshold: u64,
 }
 
 impl fmt::Debug for Files {
@@ -74,7 +73,6 @@ impl Clone for Files {
             use_guards: self.use_guards.clone(),
             guards: self.guards.clone(),
             hidden_files: self.hidden_files,
-            read_mode_threshold: self.read_mode_threshold,
         }
     }
 }
@@ -121,7 +119,6 @@ impl Files {
             use_guards: None,
             guards: Vec::new(),
             hidden_files: false,
-            read_mode_threshold: 0,
         }
     }
 
@@ -207,23 +204,6 @@ impl Files {
         self
     }
 
-    /// Sets the size threshold that determines file read mode (sync/async).
-    ///
-    /// When a file is smaller than the threshold (bytes), the reader will switch from synchronous
-    /// (blocking) file-reads to async reads to avoid blocking the main-thread when processing large
-    /// files.
-    ///
-    /// Tweaking this value according to your expected usage may lead to signifiant performance
-    /// gains (or losses in other handlers, if `size` is too high).
-    ///
-    /// When the `experimental-io-uring` crate feature is enabled, file reads are always async.
-    ///
-    /// Default is 0, meaning all files are read asynchronously.
-    pub fn read_mode_threshold(mut self, size: u64) -> Self {
-        self.read_mode_threshold = size;
-        self
-    }
-
     /// Specifies whether to use ETag or not.
     ///
     /// Default is true.
@@ -387,7 +367,6 @@ impl ServiceFactory<ServiceRequest> for Files {
             file_flags: self.file_flags,
             guards: self.use_guards.clone(),
             hidden_files: self.hidden_files,
-            size_threshold: self.read_mode_threshold,
         };
 
         if let Some(ref default) = *self.default.borrow() {

actix-files/src/named.rs

@@ -80,7 +80,6 @@ pub struct NamedFile {
     pub(crate) content_type: Mime,
     pub(crate) content_disposition: ContentDisposition,
     pub(crate) encoding: Option<ContentEncoding>,
-    pub(crate) read_mode_threshold: u64,
 }
 
 #[cfg(not(feature = "experimental-io-uring"))]
@@ -201,7 +200,6 @@ impl NamedFile {
             encoding,
             status_code: StatusCode::OK,
             flags: Flags::default(),
-            read_mode_threshold: 0,
         })
     }
 
@@ -355,23 +353,6 @@ impl NamedFile {
         self
     }
 
-    /// Sets the size threshold that determines file read mode (sync/async).
-    ///
-    /// When a file is smaller than the threshold (bytes), the reader will switch from synchronous
-    /// (blocking) file-reads to async reads to avoid blocking the main-thread when processing large
-    /// files.
-    ///
-    /// Tweaking this value according to your expected usage may lead to signifiant performance
-    /// gains (or losses in other handlers, if `size` is too high).
-    ///
-    /// When the `experimental-io-uring` crate feature is enabled, file reads are always async.
-    ///
-    /// Default is 0, meaning all files are read asynchronously.
-    pub fn read_mode_threshold(mut self, size: u64) -> Self {
-        self.read_mode_threshold = size;
-        self
-    }
-
     /// Specifies whether to return `ETag` header in response.
     ///
     /// Default is true.
@@ -459,8 +440,7 @@ impl NamedFile {
                 res.insert_header((header::CONTENT_ENCODING, current_encoding.as_str()));
             }
 
-            let reader =
-                chunked::new_chunked_read(self.md.len(), 0, self.file, self.read_mode_threshold);
+            let reader = chunked::new_chunked_read(self.md.len(), 0, self.file);
 
             return res.streaming(reader);
         }
@@ -597,7 +577,7 @@ impl NamedFile {
                 .map_into_boxed_body();
         }
 
-        let reader = chunked::new_chunked_read(length, offset, self.file, self.read_mode_threshold);
+        let reader = chunked::new_chunked_read(length, offset, self.file);
 
         if offset != 0 || length != self.md.len() {
             res.status(StatusCode::PARTIAL_CONTENT);

actix-files/src/service.rs

@@ -39,7 +39,6 @@ pub struct FilesServiceInner {
     pub(crate) file_flags: named::Flags,
     pub(crate) guards: Option<Rc<dyn Guard>>,
     pub(crate) hidden_files: bool,
-    pub(crate) size_threshold: u64,
 }
 
 impl fmt::Debug for FilesServiceInner {
@@ -71,9 +70,7 @@ impl FilesService {
         named_file.flags = self.file_flags;
 
         let (req, _) = req.into_parts();
-        let res = named_file
-            .read_mode_threshold(self.size_threshold)
-            .into_response(&req);
+        let res = named_file.into_response(&req);
         ServiceResponse::new(req, res)
     }
 
@@ -172,7 +169,17 @@ impl Service<ServiceRequest> for FilesService {
                 }
             } else {
                 match NamedFile::open_async(&path).await {
-                    Ok(named_file) => Ok(this.serve_named_file(req, named_file)),
+                    Ok(mut named_file) => {
+                        if let Some(ref mime_override) = this.mime_override {
+                            let new_disposition = mime_override(&named_file.content_type.type_());
+                            named_file.content_disposition.disposition = new_disposition;
+                        }
+                        named_file.flags = this.file_flags;
+
+                        let (req, _) = req.into_parts();
+                        let res = named_file.into_response(&req);
+                        Ok(ServiceResponse::new(req, res))
+                    }
                     Err(err) => this.handle_err(err, req).await,
                 }
             }

actix-http/CHANGES.md

@@ -2,13 +2,7 @@
 
 ## Unreleased
 
-- Properly wake Payload receivers when feeding errors or EOF
-
-## 3.11.1
-
-- Prevent more hangs after client disconnects.
-- More malformed WebSocket frames are now gracefully rejected.
-- Using `TestRequest::set_payload()` now sets a Content-Length header.
+- Malformed websocket frames are now gracefully rejected.
 
 ## 3.11.0
 

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "3.11.1"
+version = "3.11.0"
 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"]
@@ -17,6 +17,7 @@ edition.workspace = true
 rust-version.workspace = true
 
 [package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
 features = [
   "http2",
   "ws",
@@ -118,7 +119,7 @@ tokio-util = { version = "0.7", features = ["io", "codec"] }
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 # http2
-h2 = { version = "0.3.27", optional = true }
+h2 = { version = "0.3.26", optional = true }
 
 # websockets
 base64 = { version = "0.22", optional = true }
@@ -156,7 +157,7 @@ serde_json = "1.0"
 static_assertions = "1"
 tls-openssl = { package = "openssl", version = "0.10.55" }
 tls-rustls_023 = { package = "rustls", version = "0.23" }
-tokio = { version = "1.38.2", features = ["net", "rt", "macros", "sync"] }
+tokio = { version = "1.38.2", features = ["net", "rt", "macros"] }
 
 [lints]
 workspace = true

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.1)](https://docs.rs/actix-http/3.11.1)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.11.0)](https://docs.rs/actix-http/3.11.0)
 ![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.1/status.svg)](https://deps.rs/crate/actix-http/3.11.1)
+[![dependency status](https://deps.rs/crate/actix-http/3.11.0/status.svg)](https://deps.rs/crate/actix-http/3.11.0)
 [![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/payload.rs

@@ -200,13 +200,11 @@ impl Inner {
     #[inline]
     fn set_error(&mut self, err: PayloadError) {
         self.err = Some(err);
-        self.wake();
     }
 
     #[inline]
     fn feed_eof(&mut self) {
         self.eof = true;
-        self.wake();
     }
 
     #[inline]
@@ -255,13 +253,8 @@ impl Inner {
 
 #[cfg(test)]
 mod tests {
-    use std::{task::Poll, time::Duration};
-
-    use actix_rt::time::timeout;
     use actix_utils::future::poll_fn;
-    use futures_util::{FutureExt, StreamExt};
     use static_assertions::{assert_impl_all, assert_not_impl_any};
-    use tokio::sync::oneshot;
 
     use super::*;
 
@@ -270,67 +263,6 @@ mod tests {
 
     assert_impl_all!(Inner: Unpin, Send, Sync);
 
-    const WAKE_TIMEOUT: Duration = Duration::from_secs(2);
-
-    fn prepare_waking_test(
-        mut payload: Payload,
-        expected: Option<Result<(), ()>>,
-    ) -> (oneshot::Receiver<()>, actix_rt::task::JoinHandle<()>) {
-        let (tx, rx) = oneshot::channel();
-
-        let handle = actix_rt::spawn(async move {
-            // Make sure to poll once to set the waker
-            poll_fn(|cx| {
-                assert!(payload.poll_next_unpin(cx).is_pending());
-                Poll::Ready(())
-            })
-            .await;
-            tx.send(()).unwrap();
-
-            // actix-rt is single-threaded, so this won't race with `rx.await`
-            let mut pend_once = false;
-            poll_fn(|_| {
-                if pend_once {
-                    Poll::Ready(())
-                } else {
-                    // Return pending without storing wakers, we already did on the previous
-                    // `poll_fn`, now this task will only continue if the `sender` wakes us
-                    pend_once = true;
-                    Poll::Pending
-                }
-            })
-            .await;
-
-            let got = payload.next().now_or_never().unwrap();
-            match expected {
-                Some(Ok(_)) => assert!(got.unwrap().is_ok()),
-                Some(Err(_)) => assert!(got.unwrap().is_err()),
-                None => assert!(got.is_none()),
-            }
-        });
-        (rx, handle)
-    }
-
-    #[actix_rt::test]
-    async fn wake_on_error() {
-        let (mut sender, payload) = Payload::create(false);
-        let (rx, handle) = prepare_waking_test(payload, Some(Err(())));
-
-        rx.await.unwrap();
-        sender.set_error(PayloadError::Incomplete(None));
-        timeout(WAKE_TIMEOUT, handle).await.unwrap().unwrap();
-    }
-
-    #[actix_rt::test]
-    async fn wake_on_eof() {
-        let (mut sender, payload) = Payload::create(false);
-        let (rx, handle) = prepare_waking_test(payload, None);
-
-        rx.await.unwrap();
-        sender.feed_eof();
-        timeout(WAKE_TIMEOUT, handle).await.unwrap().unwrap();
-    }
-
     #[actix_rt::test]
     async fn test_unread_data() {
         let (_, mut payload) = Payload::create(false);

actix-http/src/test.rs

@@ -11,7 +11,7 @@ use std::{
 
 use actix_codec::{AsyncRead, AsyncWrite, ReadBuf};
 use bytes::{Bytes, BytesMut};
-use http::{header, Method, Uri, Version};
+use http::{Method, Uri, Version};
 
 use crate::{
     header::{HeaderMap, TryIntoHeaderPair},
@@ -98,13 +98,9 @@ impl TestRequest {
     }
 
     /// Set request payload.
-    ///
-    /// This sets the `Content-Length` header with the size of `data`.
     pub fn set_payload(&mut self, data: impl Into<Bytes>) -> &mut Self {
         let mut payload = crate::h1::Payload::empty();
-        let bytes = data.into();
-        self.insert_header((header::CONTENT_LENGTH, bytes.len()));
-        payload.unread_data(bytes);
+        payload.unread_data(data.into());
         parts(&mut self.0).payload = Some(payload.into());
         self
     }

actix-multipart-derive/Cargo.toml

@@ -11,6 +11,7 @@ edition.workspace = true
 rust-version.workspace = true
 
 [package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
 all-features = true
 
 [lib]

actix-multipart/Cargo.toml

@@ -14,6 +14,7 @@ license.workspace = true
 edition.workspace = true
 
 [package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
 all-features = true
 
 [package.metadata.cargo_check_external_types]

actix-router/benches/router.rs

@@ -13,7 +13,6 @@ macro_rules! register {
         register!(finish => "(.*)", "(.*)", "(.*)", "(.*)")
     }};
     (finish => $p1:literal, $p2:literal, $p3:literal, $p4:literal) => {{
-        #[expect(clippy::useless_concat)]
         let arr = [
             concat!("/authorizations"),
             concat!("/authorizations/", $p1),

actix-web-actors/Cargo.toml

@@ -24,7 +24,7 @@ allowed_external_types = [
 actix = { version = ">=0.12, <0.14", default-features = false }
 actix-codec = "0.5"
 actix-http = "3"
-actix-web = { version = "4", default-features = false, features = ["ws"] }
+actix-web = { version = "4", default-features = false }
 
 bytes = "1"
 bytestring = "1"

actix-web/CHANGES.md

@@ -4,7 +4,6 @@
 
 - `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.
 
 ## 4.11.0
 

actix-web/Cargo.toml

@@ -17,6 +17,7 @@ edition.workspace = true
 rust-version.workspace = true
 
 [package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
 features = [
   "macros",
   "openssl",
@@ -67,7 +68,6 @@ default = [
   "http2",
   "unicode",
   "compat",
-  "ws",
 ]
 
 # Brotli algorithm content-encoding support
@@ -86,12 +86,9 @@ cookies = ["dep:cookie"]
 # Secure & signed cookies
 secure-cookies = ["cookies", "cookie/secure"]
 
-# HTTP/2 support (including h2c)
+# HTTP/2 support (including h2c).
 http2 = ["actix-http/http2"]
 
-# WebSocket support
-ws = ["actix-http/ws"]
-
 # TLS via OpenSSL
 openssl = ["__tls", "http2", "actix-http/openssl", "actix-tls/accept", "actix-tls/openssl"]
 
@@ -135,7 +132,7 @@ actix-service = "2"
 actix-tls = { version = "3.4", default-features = false, optional = true }
 actix-utils = "3"
 
-actix-http = "3.11"
+actix-http = { version = "3.11", features = ["ws"] }
 actix-router = { version = "0.5.3", default-features = false, features = ["http"] }
 actix-web-codegen = { version = "4.3", optional = true, default-features = false }
 

actix-web/MIGRATION-3.0.md

@@ -3,6 +3,7 @@
 - The return type for `ServiceRequest::app_data::<T>()` was changed from returning a `Data<T>` to simply a `T`. To access a `Data<T>` use `ServiceRequest::app_data::<Data<T>>()`.
 
 - Cookie handling has been offloaded to the `cookie` crate:
+
   - `USERINFO_ENCODE_SET` is no longer exposed. Percent-encoding is still supported; check docs.
   - Some types now require lifetime parameters.
 

actix-web/src/error/response_error.rs

@@ -7,6 +7,7 @@ use std::{
     io::{self, Write as _},
 };
 
+use actix_http::Response;
 use bytes::BytesMut;
 
 use crate::{
@@ -125,24 +126,20 @@ impl ResponseError for actix_http::error::PayloadError {
     }
 }
 
+impl ResponseError for actix_http::ws::ProtocolError {}
+
 impl ResponseError for actix_http::error::ContentTypeError {
     fn status_code(&self) -> StatusCode {
         StatusCode::BAD_REQUEST
     }
 }
 
-#[cfg(feature = "ws")]
 impl ResponseError for actix_http::ws::HandshakeError {
     fn error_response(&self) -> HttpResponse<BoxBody> {
-        actix_http::Response::from(self)
-            .map_into_boxed_body()
-            .into()
+        Response::from(self).map_into_boxed_body().into()
     }
 }
 
-#[cfg(feature = "ws")]
-impl ResponseError for actix_http::ws::ProtocolError {}
-
 #[cfg(test)]
 mod tests {
     use super::*;

actix-web/src/middleware/authors-guide.md

@@ -2,80 +2,16 @@
 
 ## What Is A Middleware?
 
-Middleware in Actix Web is a powerful mechanism that allows you to add additional behavior to request/response processing. It enables you to:
-
-- Pre-process incoming requests (e.g., path normalization, authentication)
-- Post-process outgoing responses (e.g., logging, compression)
-- Modify application state through ServiceRequest
-- Access external services (e.g., sessions, caching)
-
-Middleware is registered for each App, Scope, or Resource and executed in the reverse order of registration. This means the last registered middleware is the first to process the request.
-
 ## Middleware Traits
 
-Actix Web's middleware system is built on two main traits:
-
-1. `Transform<S, Req>`: The builder trait that creates the actual Service. It's responsible for:
-
-   - Creating new middleware instances
-   - Assembling the middleware chain
-   - Handling initialization errors
-
-2. `Service<Req>`: The trait that represents the actual middleware functionality. It:
-   - Processes requests and responses
-   - Can modify both request and response
-   - Can short-circuit request processing
-   - Must be implemented for the middleware to work
-
 ## Understanding Body Types
 
-When working with middleware, it's important to understand body types:
-
-- Middleware can work with different body types for requests and responses
-- The `MessageBody` trait is used to handle different body types
-- You can use `EitherBody` when you need to handle multiple body types
-- Be careful with body consumption - once a body is consumed, it cannot be read again
-
 ## Best Practices
 
-1. Keep middleware focused and single-purpose
-2. Handle errors appropriately and propagate them correctly
-3. Be mindful of performance impact
-4. Use appropriate body types and handle them correctly
-5. Consider middleware ordering carefully
-6. Document your middleware's behavior and requirements
-7. Test your middleware thoroughly
-
 ## Error Propagation
 
-Proper error handling is crucial in middleware:
-
-1. Always propagate errors from the inner service
-2. Use appropriate error types
-3. Handle initialization errors
-4. Consider using custom error types for specific middleware errors
-5. Document error conditions and handling
-
 ## When To (Not) Use Middleware
 
-Use middleware when you need to:
-
-- Add cross-cutting concerns
-- Modify requests/responses globally
-- Add authentication/authorization
-- Add logging or monitoring
-- Handle compression or caching
-
-Avoid middleware when:
-
-- The functionality is specific to a single route
-- The operation is better handled by a service
-- The overhead would be too high
-- The functionality can be implemented more simply
-
 ## Author's References
 
 - `EitherBody` + when is middleware appropriate: https://discord.com/channels/771444961383153695/952016890723729428
-- Actix Web Documentation: https://docs.rs/actix-web
-- Service Trait Documentation: https://docs.rs/actix-service
-- MessageBody Trait Documentation: https://docs.rs/actix-web/latest/actix_web/body/trait.MessageBody.html

actix-web/src/types/json.rs

@@ -616,7 +616,7 @@ mod tests {
             }
         ));
 
-        let (mut req, mut pl) = TestRequest::default()
+        let (req, mut pl) = TestRequest::default()
             .insert_header((
                 header::CONTENT_TYPE,
                 header::HeaderValue::from_static("application/json"),
@@ -624,7 +624,6 @@ mod tests {
             .set_payload(Bytes::from_static(&[0u8; 1000]))
             .to_http_parts();
 
-        req.head_mut().headers_mut().remove(header::CONTENT_LENGTH);
         let json = JsonBody::<MyObject>::new(&req, &mut pl, None, true)
             .limit(100)
             .await;

awc/Cargo.toml

@@ -16,6 +16,7 @@ license = "MIT OR Apache-2.0"
 edition = "2021"
 
 [package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
 features = [
     "cookies",
     "openssl",
@@ -108,7 +109,7 @@ cfg-if = "1"
 derive_more = { version = "2", features = ["display", "error", "from"] }
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc", "sink"] }
-h2 = "0.3.27"
+h2 = "0.3.26"
 http = "0.2.7"
 itoa = "1"
 log = "0.4"

justfile

@@ -13,8 +13,6 @@ fmt:
 [private]
 downgrade-for-msrv:
     cargo {{ toolchain }} update -p=divan --precise=0.1.15 # next ver: 1.80.0
-    cargo {{ toolchain }} update -p=rayon --precise=1.10.0 # next ver: 1.80.0
-    cargo {{ toolchain }} update -p=rayon-core --precise=1.12.1 # next ver: 1.80.0
     cargo {{ toolchain }} update -p=half --precise=2.4.1 # next ver: 1.81.0
     cargo {{ toolchain }} update -p=idna_adapter --precise=1.2.0 # next ver: 1.82.0
     cargo {{ toolchain }} update -p=litemap --precise=0.7.4 # next ver: 1.81.0
@@ -52,7 +50,8 @@ clippy:
     cargo {{ toolchain }} clippy --workspace --all-targets {{ all_crate_features }}
 
 # Run Clippy over workspace using MSRV.
-clippy-msrv: downgrade-for-msrv
+clippy-msrv:
+    @just toolchain={{ msrv_rustup }} downgrade-for-msrv
     @just toolchain={{ msrv_rustup }} clippy
 
 # Test workspace code.
@@ -63,7 +62,8 @@ test:
     cargo {{ toolchain }} nextest run --no-tests=warn --workspace --exclude=actix-web-codegen --exclude=actix-multipart-derive {{ all_crate_features }} --filter-expr="not test(test_reading_deflate_encoding_large_random_rustls)"
 
 # Test workspace using MSRV.
-test-msrv: downgrade-for-msrv
+test-msrv:
+    @just toolchain={{ msrv_rustup }} downgrade-for-msrv
     @just toolchain={{ msrv_rustup }} test
 
 # Test workspace docs.

scripts/bump

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # developed on macOS and probably doesn't work on Linux yet due to minor
 # differences in flags on sed

scripts/ci-test

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# run tests matching what CI does for non-linux feature sets
+
+set -x
+
+EXIT=0
+
+save_exit_code() {
+    eval $@
+    local CMD_EXIT=$?
+    [ "$CMD_EXIT" = "0" ] || EXIT=$CMD_EXIT
+}
+
+save_exit_code cargo test --lib --tests -p=actix-router --all-features -- --nocapture
+save_exit_code cargo test --lib --tests -p=actix-http --all-features -- --nocapture
+save_exit_code cargo test --lib --tests -p=actix-web --features=rustls,openssl -- --nocapture
+save_exit_code cargo test --lib --tests -p=actix-web-codegen --all-features -- --nocapture
+save_exit_code cargo test --lib --tests -p=awc --all-features -- --nocapture
+save_exit_code cargo test --lib --tests -p=actix-http-test --all-features -- --nocapture
+save_exit_code cargo test --lib --tests -p=actix-test --all-features -- --nocapture
+save_exit_code cargo test --lib --tests -p=actix-files -- --nocapture
+save_exit_code cargo test --lib --tests -p=actix-multipart --all-features -- --nocapture
+save_exit_code cargo test --lib --tests -p=actix-web-actors --all-features -- --nocapture
+
+save_exit_code cargo test --workspace --doc
+
+if [ "$EXIT" = "0" ]; then
+    PASSED="All tests passed!"
+
+    if [ "$(command -v figlet)" ]; then
+        figlet "$PASSED"
+    else
+        echo "$PASSED"
+    fi
+fi
+
+exit $EXIT

scripts/publish

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-set -Euo pipefail
-
-for dir in $@; do
-    cd "$dir"
-    
-    cargo publish --dry-run
-
-    read -p "Look okay? "
-    read -p "Sure? "
-    
-    cargo publish
-
-    if [ $? -ne 0 ]; then
-        echo
-        read -p "Was the above error caused by cyclic dev-deps? Choosing yes will publish without a git backreference. (y/N) " publish_no_dev_deps
-
-        if [[ "$publish_no_dev_deps" == "y" || "$publish_no_dev_deps" == "Y" ]]; then
-            cargo hack --no-dev-deps publish --allow-dirty
-        fi
-    fi
-
-    cd ..
-done