Merge afad1db343 into e3ae20de30

.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" },
 ]

.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-http/CHANGES.md

@@ -2,11 +2,7 @@
 
 ## Unreleased
 
-## 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"]

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/dispatcher.rs

@@ -1182,7 +1182,7 @@ 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) {
+                    if inner_p.flags.contains(Flags::READ_DISCONNECT) && state_is_none {
                         trace!("read half closed; start shutdown");
                         inner_p.flags.insert(Flags::SHUTDOWN);
                     }
@@ -1216,9 +1216,6 @@ where
                         inner_p.shutdown_timer,
                     );
 
-                    if inner_p.flags.contains(Flags::SHUTDOWN) {
-                        cx.waker().wake_by_ref();
-                    }
                     Poll::Pending
                 };
 

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-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/CHANGES.md

@@ -2,9 +2,6 @@
 
 ## Unreleased
 
-- `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.
-
 ## 4.11.0
 
 - Add `Logger::log_level()` method.

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/response/builder.rs

@@ -318,33 +318,12 @@ impl HttpResponseBuilder {
     /// Set a streaming body and build the `HttpResponse`.
     ///
     /// `HttpResponseBuilder` can not be used after this call.
-    ///
-    /// If `Content-Type` is not set, then it is automatically set to `application/octet-stream`.
-    ///
-    /// If `Content-Length` is set, then [`no_chunking()`](Self::no_chunking) is automatically called.
     #[inline]
     pub fn streaming<S, E>(&mut self, stream: S) -> HttpResponse
     where
         S: Stream<Item = Result<Bytes, E>> + 'static,
         E: Into<BoxError> + 'static,
     {
-        // Set mime type to application/octet-stream if it is not set
-        if let Some(parts) = self.inner() {
-            if !parts.headers.contains_key(header::CONTENT_TYPE) {
-                self.insert_header((header::CONTENT_TYPE, mime::APPLICATION_OCTET_STREAM));
-            }
-        }
-
-        if let Some(parts) = self.inner() {
-            if let Some(length) = parts.headers.get(header::CONTENT_LENGTH) {
-                if let Ok(length) = length.to_str() {
-                    if let Ok(length) = length.parse::<u64>() {
-                        self.no_chunking(length);
-                    }
-                }
-            }
-        }
-
         self.body(BodyStream::new(stream))
     }
 

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;

actix-web/tests/test_streaming_response.rs

@@ -1,115 +0,0 @@
-use std::{
-    pin::Pin,
-    task::{Context, Poll},
-};
-
-use actix_web::{
-    http::header::{self, HeaderValue},
-    HttpResponse,
-};
-use bytes::Bytes;
-use futures_core::Stream;
-
-struct FixedSizeStream {
-    data: Vec<u8>,
-    yielded: bool,
-}
-
-impl FixedSizeStream {
-    fn new(size: usize) -> Self {
-        Self {
-            data: vec![0u8; size],
-            yielded: false,
-        }
-    }
-}
-
-impl Stream for FixedSizeStream {
-    type Item = Result<Bytes, std::io::Error>;
-
-    fn poll_next(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        if self.yielded {
-            Poll::Ready(None)
-        } else {
-            self.yielded = true;
-            let data = std::mem::take(&mut self.data);
-            Poll::Ready(Some(Ok(Bytes::from(data))))
-        }
-    }
-}
-
-#[actix_rt::test]
-async fn test_streaming_response_with_content_length() {
-    let stream = FixedSizeStream::new(100);
-
-    let resp = HttpResponse::Ok()
-        .append_header((header::CONTENT_LENGTH, "100"))
-        .streaming(stream);
-
-    assert_eq!(
-        resp.headers().get(header::CONTENT_LENGTH),
-        Some(&HeaderValue::from_static("100")),
-        "Content-Length should be preserved when explicitly set"
-    );
-
-    let has_chunked = resp
-        .headers()
-        .get(header::TRANSFER_ENCODING)
-        .map(|v| v.to_str().unwrap_or(""))
-        .unwrap_or("")
-        .contains("chunked");
-
-    assert!(
-        !has_chunked,
-        "chunked should not be used when Content-Length is provided"
-    );
-
-    assert_eq!(
-        resp.headers().get(header::CONTENT_TYPE),
-        Some(&HeaderValue::from_static("application/octet-stream")),
-        "Content-Type should default to application/octet-stream"
-    );
-}
-
-#[actix_rt::test]
-async fn test_streaming_response_default_content_type() {
-    let stream = FixedSizeStream::new(50);
-
-    let resp = HttpResponse::Ok().streaming(stream);
-
-    assert_eq!(
-        resp.headers().get(header::CONTENT_TYPE),
-        Some(&HeaderValue::from_static("application/octet-stream")),
-        "Content-Type should default to application/octet-stream"
-    );
-}
-
-#[actix_rt::test]
-async fn test_streaming_response_user_defined_content_type() {
-    let stream = FixedSizeStream::new(25);
-
-    let resp = HttpResponse::Ok()
-        .insert_header((header::CONTENT_TYPE, "text/plain"))
-        .streaming(stream);
-
-    assert_eq!(
-        resp.headers().get(header::CONTENT_TYPE),
-        Some(&HeaderValue::from_static("text/plain")),
-        "User-defined Content-Type should be preserved"
-    );
-}
-
-#[actix_rt::test]
-async fn test_streaming_response_empty_stream() {
-    let stream = FixedSizeStream::new(0);
-
-    let resp = HttpResponse::Ok()
-        .append_header((header::CONTENT_LENGTH, "0"))
-        .streaming(stream);
-
-    assert_eq!(
-        resp.headers().get(header::CONTENT_LENGTH),
-        Some(&HeaderValue::from_static("0")),
-        "Content-Length 0 should be preserved for empty streams"
-    );
-}

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