chore(actix-web): prepare release 4.8.0

chore(actix-http): prepare release 3.8.0
ci: fix checks
2025-07-04 18:06:23 +02:00 · 2024-06-20 00:23:11 +01:00 · 2024-06-20 00:18:22 +01:00 · 2024-06-20 00:13:42 +01:00 · 2024-06-20 00:04:35 +01:00 · 2024-06-19 22:34:49 +00:00
42 changed files with 649 additions and 178 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@ -1,10 +0,0 @@
-[alias]
-lint = "clippy --workspace --all-targets -- -Dclippy::todo"
-lint-all = "clippy --workspace --all-features --all-targets -- -Dclippy::todo"
-
-# lib checking
-ci-check-min = "hack --workspace check --no-default-features"
-ci-check-default = "hack --workspace check"
-ci-check-default-tests = "check --workspace --tests"
-ci-check-all-feature-powerset="hack --workspace --feature-powerset --depth=4 --skip=__compress,experimental-io-uring check"
-ci-check-all-feature-powerset-linux="hack --workspace --feature-powerset --depth=4 --skip=__compress check"
--- a/.github/workflows/ci-post-merge.yml
+++ b/.github/workflows/ci-post-merge.yml
@ -44,20 +44,20 @@ jobs:
          echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV

      - name: Install Rust (${{ matrix.version.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
        with:
          toolchain: ${{ matrix.version.version }}

      - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.34.0
+        uses: taiki-e/install-action@v2.39.1
        with:
          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean

      - name: check minimal
-        run: cargo ci-check-min
+        run: just check-min

      - name: check default
-        run: cargo ci-check-default
+        run: just check-default

      - name: tests
        timeout-minutes: 60
@ -76,16 +76,16 @@ jobs:
      - name: Free Disk Space
        run: ./scripts/free-disk-space.sh

+      - name: Setup mold linker
+        uses: rui314/setup-mold@v1
+
      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0

-      - name: Install cargo-hack
-        uses: taiki-e/install-action@v2.34.0
+      - name: Install just, cargo-hack
+        uses: taiki-e/install-action@v2.39.1
        with:
-          tool: cargo-hack
+          tool: just,cargo-hack

-      - name: check feature combinations
-        run: cargo ci-check-all-feature-powerset
-
-      - name: check feature combinations
-        run: cargo ci-check-all-feature-powerset-linux
+      - name: Check feature combinations
+        run: just check-feature-combinations
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -59,12 +59,12 @@ jobs:
        uses: rui314/setup-mold@v1

      - name: Install Rust (${{ matrix.version.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
        with:
          toolchain: ${{ matrix.version.version }}

      - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.34.0
+        uses: taiki-e/install-action@v2.39.1
        with:
          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean

@ -73,10 +73,10 @@ jobs:
        run: just downgrade-for-msrv

      - name: check minimal
-        run: cargo ci-check-min
+        run: just check-min

      - name: check default
-        run: cargo ci-check-default
+        run: just check-default

      - name: tests
        timeout-minutes: 60
@ -92,7 +92,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
        with:
          toolchain: nightly

@ -108,12 +108,12 @@ jobs:
      - uses: actions/checkout@v4

      - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
        with:
          toolchain: nightly

      - name: Install just
-        uses: taiki-e/install-action@v2.34.0
+        uses: taiki-e/install-action@v2.39.1
        with:
          tool: just

--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@ -17,21 +17,22 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+      - name: Install Rust (nightly)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
        with:
-          components: llvm-tools-preview
+          toolchain: nightly
+          components: llvm-tools

-      - name: Install just,cargo-llvm-cov
-        uses: taiki-e/install-action@v2.34.0
+      - name: Install just, cargo-llvm-cov, cargo-nextest
+        uses: taiki-e/install-action@v2.39.1
        with:
-          tool: just,cargo-llvm-cov
+          tool: just,cargo-llvm-cov,cargo-nextest

      - name: Generate code coverage
-        run: cargo llvm-cov --workspace --all-features --codecov --output-path codecov.json
+        run: just test-coverage-codecov

      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4.4.1
+        uses: codecov/codecov-action@v4.5.0
        with:
          files: codecov.json
          fail_ci_if_error: true
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@ -18,7 +18,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
        with:
          toolchain: nightly
          components: rustfmt
@ -36,7 +36,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
        with:
          components: clippy

@ -55,7 +55,7 @@ jobs:
      - uses: actions/checkout@v4

      - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
        with:
          toolchain: nightly
          components: rust-docs
@ -65,6 +65,29 @@ jobs:
          RUSTDOCFLAGS: -D warnings
        run: cargo +nightly doc --no-deps --workspace --all-features

+  check-external-types:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust (nightly-2024-05-01)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
+        with:
+          toolchain: nightly-2024-05-01
+
+      - name: Install just
+        uses: taiki-e/install-action@v2.39.1
+        with:
+          tool: just
+
+      - name: Install cargo-check-external-types
+        uses: taiki-e/cache-cargo-install-action@v2.0.1
+        with:
+          tool: cargo-check-external-types
+
+      - name: check external types
+        run: just check-external-types-all +nightly-2024-05-01
+
  public-api-diff:
    runs-on: ubuntu-latest
    steps:
@ -76,13 +99,13 @@ jobs:
      - name: Checkout PR branch
        uses: actions/checkout@v4

-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
+      - name: Install Rust (nightly-2024-06-07)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.9.0
        with:
          toolchain: nightly-2024-06-07

      - name: Install cargo-public-api
-        uses: taiki-e/install-action@v2.34.0
+        uses: taiki-e/install-action@v2.39.1
        with:
          tool: cargo-public-api

--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@ -2,6 +2,9 @@

 ## Unreleased

+## 0.6.6
+
+- Update `tokio-uring` dependency to `0.4`.
 - Minimum supported Rust version (MSRV) is now 1.72.

 ## 0.6.5
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "actix-files"
-version = "0.6.5"
+version = "0.6.6"
 authors = [
    "Nikolay Kim <fafhrd91@gmail.com>",
    "Rob Ede <robjtede@icloud.com>",
@ -13,9 +13,14 @@ categories = ["asynchronous", "web-programming::http-server"]
 license = "MIT OR Apache-2.0"
 edition = "2021"

-[lib]
-name = "actix_files"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_http::*",
+    "actix_service::*",
+    "actix_web::*",
+    "http::*",
+    "mime::*",
+]

 [features]
 experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
@ -40,8 +45,8 @@ v_htmlescape = "0.15.5"

 # experimental-io-uring
 [target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.4", optional = true, features = ["bytes"] }
-actix-server = { version = "2.2", optional = true } # ensure matching tokio-uring versions
+tokio-uring = { version = "0.5", optional = true, features = ["bytes"] }
+actix-server = { version = "2.4", optional = true } # ensure matching tokio-uring versions

 [dev-dependencies]
 actix-rt = "2.7"
--- a/actix-files/README.md
+++ b/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.5)](https://docs.rs/actix-files/0.6.5)
+[![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.5/status.svg)](https://deps.rs/crate/actix-files/0.6.5)
+[![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)

--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@ -18,9 +18,17 @@ edition = "2021"
 [package.metadata.docs.rs]
 features = []

-[lib]
-name = "actix_http_test"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_codec::*",
+    "actix_http::*",
+    "actix_server::*",
+    "awc::*",
+    "bytes::*",
+    "futures_core::*",
+    "http::*",
+    "tokio::*",
+]

 [features]
 default = []
--- a/actix-http-test/README.md
+++ b/actix-http-test/README.md
@ -1,7 +1,5 @@
 # `actix-http-test`

-> Various helpers for Actix applications to use during testing.
-
 <!-- prettier-ignore-start -->

 [![crates.io](https://img.shields.io/crates/v/actix-http-test?label=latest)](https://crates.io/crates/actix-http-test)
@ -14,3 +12,9 @@
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)

 <!-- prettier-ignore-end -->
+
+<!-- cargo-rdme start -->
+
+Various helpers for Actix applications to use during testing.
+
+<!-- cargo-rdme end -->
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@ -2,6 +2,12 @@

 ## Unreleased

+## 3.8.0
+
+### Added
+
+- Add `error::InvalidStatusCode` re-export.
+
 ## 3.7.0

 ### Added
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "3.7.0"
+version = "3.8.0"
 authors = [
    "Nikolay Kim <fafhrd91@gmail.com>",
    "Rob Ede <robjtede@icloud.com>",
@ -34,51 +34,72 @@ features = [
    "compress-zstd",
 ]

-[lib]
-name = "actix_http"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_codec::*",
+    "actix_service::*",
+    "actix_tls::*",
+    "actix_utils::*",
+    "bytes::*",
+    "bytestring::*",
+    "encoding_rs::*",
+    "futures_core::*",
+    "h2::*",
+    "http::*",
+    "httparse::*",
+    "language_tags::*",
+    "mime::*",
+    "openssl::*",
+    "rustls::*",
+    "tokio_util::*",
+    "tokio::*",
+]

 [features]
 default = []

 # HTTP/2 protocol support
-http2 = ["h2"]
+http2 = ["dep:h2"]

 # WebSocket protocol implementation
 ws = [
-    "local-channel",
-    "base64",
-    "rand",
-    "sha1",
+    "dep:local-channel",
+    "dep:base64",
+    "dep:rand",
+    "dep:sha1",
 ]

 # TLS via OpenSSL
-openssl = ["actix-tls/accept", "actix-tls/openssl"]
+openssl = ["__tls", "actix-tls/accept", "actix-tls/openssl"]

 # TLS via Rustls v0.20
-rustls = ["rustls-0_20"]
+rustls = ["__tls", "rustls-0_20"]

 # TLS via Rustls v0.20
-rustls-0_20 = ["actix-tls/accept", "actix-tls/rustls-0_20"]
+rustls-0_20 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_20"]

 # TLS via Rustls v0.21
-rustls-0_21 = ["actix-tls/accept", "actix-tls/rustls-0_21"]
+rustls-0_21 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_21"]

 # TLS via Rustls v0.22
-rustls-0_22 = ["actix-tls/accept", "actix-tls/rustls-0_22"]
+rustls-0_22 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_22"]

 # TLS via Rustls v0.23
-rustls-0_23 = ["actix-tls/accept", "actix-tls/rustls-0_23"]
+rustls-0_23 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_23"]

 # Compression codecs
-compress-brotli = ["__compress", "brotli"]
-compress-gzip   = ["__compress", "flate2"]
-compress-zstd   = ["__compress", "zstd"]
+compress-brotli = ["__compress", "dep:brotli"]
+compress-gzip   = ["__compress", "dep:flate2"]
+compress-zstd   = ["__compress", "dep:zstd"]

 # Internal (PRIVATE!) features used to aid testing and checking feature status.
 # Don't rely on these whatsoever. They are semver-exempt and may disappear at anytime.
 __compress = []

+# Internal (PRIVATE!) features used to aid checking feature status.
+# Don't rely on these whatsoever. They may disappear at anytime.
+__tls = []
+
 [dependencies]
 actix-service = "2"
 actix-codec = "0.5"
@ -106,7 +127,7 @@ tokio-util = { version = "0.7", features = ["io", "codec"] }
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }

 # http2
-h2 = { version = "0.3.24", optional = true }
+h2 = { version = "0.3.26", optional = true }

 # websockets
 local-channel = { version = "0.1", optional = true }
--- a/actix-http/README.md
+++ b/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.7.0)](https://docs.rs/actix-http/3.7.0)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.8.0)](https://docs.rs/actix-http/3.8.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.7.0/status.svg)](https://deps.rs/crate/actix-http/3.7.0)
+[![dependency status](https://deps.rs/crate/actix-http/3.8.0/status.svg)](https://deps.rs/crate/actix-http/3.8.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)

--- a/actix-http/src/error.rs
+++ b/actix-http/src/error.rs
@ -3,7 +3,7 @@
 use std::{error::Error as StdError, fmt, io, str::Utf8Error, string::FromUtf8Error};

 use derive_more::{Display, Error, From};
-pub use http::Error as HttpError;
+pub use http::{status::InvalidStatusCode, Error as HttpError};
 use http::{uri::InvalidUri, StatusCode};

 use crate::{body::BoxBody, Response};
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@ -6,10 +6,10 @@
 //! | ------------------- | ------------------------------------------- |
 //! | `http2`             | HTTP/2 support via [h2].                    |
 //! | `openssl`           | TLS support via [OpenSSL].                  |
-//! | `rustls`            | TLS support via [rustls]  0.20.             |
-//! | `rustls-0_21`       | TLS support via [rustls]  0.21.             |
-//! | `rustls-0_22`       | TLS support via [rustls]  0.22.             |
-//! | `rustls-0_23`       | TLS support via [rustls]  0.23.             |
+//! | `rustls-0_20`       | TLS support via rustls 0.20.                |
+//! | `rustls-0_21`       | TLS support via rustls 0.21.                |
+//! | `rustls-0_22`       | TLS support via rustls 0.22.                |
+//! | `rustls-0_23`       | TLS support via [rustls] 0.23.              |
 //! | `compress-brotli`   | Payload compression support: Brotli.        |
 //! | `compress-gzip`     | Payload compression support: Deflate, Gzip. |
 //! | `compress-zstd`     | Payload compression support: Zstd.          |
@ -61,13 +61,7 @@ pub mod ws;

 #[allow(deprecated)]
 pub use self::payload::PayloadStream;
-#[cfg(any(
-    feature = "openssl",
-    feature = "rustls-0_20",
-    feature = "rustls-0_21",
-    feature = "rustls-0_22",
-    feature = "rustls-0_23",
-))]
+#[cfg(feature = "__tls")]
 pub use self::service::TlsAcceptorConfig;
 pub use self::{
    builder::HttpServiceBuilder,
--- a/actix-http/src/service.rs
+++ b/actix-http/src/service.rs
@ -241,25 +241,13 @@ where
 }

 /// Configuration options used when accepting TLS connection.
-#[cfg(any(
-    feature = "openssl",
-    feature = "rustls-0_20",
-    feature = "rustls-0_21",
-    feature = "rustls-0_22",
-    feature = "rustls-0_23",
-))]
+#[cfg(feature = "__tls")]
 #[derive(Debug, Default)]
 pub struct TlsAcceptorConfig {
    pub(crate) handshake_timeout: Option<std::time::Duration>,
 }

-#[cfg(any(
-    feature = "openssl",
-    feature = "rustls-0_20",
-    feature = "rustls-0_21",
-    feature = "rustls-0_22",
-    feature = "rustls-0_23",
-))]
+#[cfg(feature = "__tls")]
 impl TlsAcceptorConfig {
    /// Set TLS handshake timeout duration.
    pub fn handshake_timeout(self, dur: std::time::Duration) -> Self {
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@ -16,6 +16,21 @@ edition = "2021"
 rustdoc-args = ["--cfg", "docsrs"]
 all-features = true

+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_http::*",
+    "actix_multipart_derive::*",
+    "actix_utils::*",
+    "actix_web::*",
+    "bytes::*",
+    "futures_core::*",
+    "mime::*",
+    "serde_json::*",
+    "serde_plain::*",
+    "serde::*",
+    "tempfile::*",
+]
+
 [features]
 default = ["tempfile", "derive"]
 derive = ["actix-multipart-derive"]
--- a/actix-multipart/README.md
+++ b/actix-multipart/README.md
@ -1,7 +1,5 @@
 # `actix-multipart`

-> Multipart form support for Actix Web.
-
 <!-- prettier-ignore-start -->

 [![crates.io](https://img.shields.io/crates/v/actix-multipart?label=latest)](https://crates.io/crates/actix-multipart)
@ -15,18 +13,11 @@

 <!-- prettier-ignore-end -->

-## Example
+<!-- cargo-rdme start -->

-Dependencies:
+Multipart form support for Actix Web.

-```toml
-[dependencies]
-actix-multipart = "0.6"
-actix-web = "4.5"
-serde = { version = "1.0", features = ["derive"] }
-```
-
-Code:
+## Examples

 ```rust
 use actix_web::{post, App, HttpServer, Responder};
@ -63,6 +54,10 @@ async fn main() -> std::io::Result<()> {
 }
 ```

+<!-- cargo-rdme end -->
+
+[More available in the examples repo &rarr;](https://github.com/actix/examples/tree/master/forms/multipart)
+
 Curl request :

 ```bash
@ -71,7 +66,3 @@ curl -v --request POST \
  -F 'json={"name": "Cargo.lock"};type=application/json' \
  -F file=@./Cargo.lock
 ```
-
-### Examples
-
-https://github.com/actix/examples/tree/master/forms/multipart
--- a/actix-multipart/src/form/mod.rs
+++ b/actix-multipart/src/form/mod.rs
@ -33,6 +33,14 @@ pub trait FieldReader<'t>: Sized + Any {
    type Future: Future<Output = Result<Self, MultipartError>>;

    /// The form will call this function to handle the field.
+    ///
+    /// # Panics
+    ///
+    /// When reading the `field` payload using its `Stream` implementation, polling (manually or via
+    /// `next()`/`try_next()`) may panic after the payload is exhausted. If this is a problem for
+    /// your implementation of this method, you should [`fuse()`] the `Field` first.
+    ///
+    /// [`fuse()`]: futures_util::stream::StreamExt::fuse()
    fn read_field(req: &'t HttpRequest, field: Field, limits: &'t mut Limits) -> Self::Future;
 }

@ -396,11 +404,20 @@ mod tests {
    use actix_http::encoding::Decoder;
    use actix_multipart_rfc7578::client::multipart;
    use actix_test::TestServer;
-    use actix_web::{dev::Payload, http::StatusCode, web, App, HttpResponse, Responder};
+    use actix_web::{
+        dev::Payload, http::StatusCode, web, App, HttpRequest, HttpResponse, Resource, Responder,
+    };
    use awc::{Client, ClientResponse};
+    use futures_core::future::LocalBoxFuture;
+    use futures_util::TryStreamExt as _;

    use super::MultipartForm;
-    use crate::form::{bytes::Bytes, tempfile::TempFile, text::Text, MultipartFormConfig};
+    use crate::{
+        form::{
+            bytes::Bytes, tempfile::TempFile, text::Text, FieldReader, Limits, MultipartFormConfig,
+        },
+        Field, MultipartError,
+    };

    pub async fn send_form(
        srv: &TestServer,
@ -734,4 +751,49 @@ mod tests {
        let response = send_form(&srv, form, "/").await;
        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
    }
+
+    #[should_panic(expected = "called `Result::unwrap()` on an `Err` value: Connect(Disconnected)")]
+    #[actix_web::test]
+    async fn field_try_next_panic() {
+        #[derive(Debug)]
+        struct NullSink;
+
+        impl<'t> FieldReader<'t> for NullSink {
+            type Future = LocalBoxFuture<'t, Result<Self, MultipartError>>;
+
+            fn read_field(
+                _: &'t HttpRequest,
+                mut field: Field,
+                _limits: &'t mut Limits,
+            ) -> Self::Future {
+                Box::pin(async move {
+                    // exhaust field stream
+                    while let Some(_chunk) = field.try_next().await? {}
+
+                    // poll again, crash
+                    let _post = field.try_next().await;
+
+                    Ok(Self)
+                })
+            }
+        }
+
+        #[allow(dead_code)]
+        #[derive(MultipartForm)]
+        struct NullSinkForm {
+            foo: NullSink,
+        }
+
+        async fn null_sink(_form: MultipartForm<NullSinkForm>) -> impl Responder {
+            "unreachable"
+        }
+
+        let srv = actix_test::start(|| App::new().service(Resource::new("/").post(null_sink)));
+
+        let mut form = multipart::Form::default();
+        form.add_text("foo", "data is not important to this test");
+
+        // panics with Err(Connect(Disconnected)) due to form NullSink panic
+        let _res = send_form(&srv, form, "/").await;
+    }
 }
--- a/actix-multipart/src/lib.rs
+++ b/actix-multipart/src/lib.rs
@ -1,5 +1,7 @@
 //! Multipart form support for Actix Web.
+//!
 //! # Examples
+//!
 //! ```no_run
 //! use actix_web::{post, App, HttpServer, Responder};
 //!
--- a/actix-multipart/src/server.rs
+++ b/actix-multipart/src/server.rs
@ -465,7 +465,12 @@ impl Stream for Field {
    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
        let this = self.get_mut();
        let mut inner = this.inner.borrow_mut();
-        if let Some(mut buffer) = inner.payload.as_ref().unwrap().get_mut(&this.safety) {
+        if let Some(mut buffer) = inner
+            .payload
+            .as_ref()
+            .expect("Field should not be polled after completion")
+            .get_mut(&this.safety)
+        {
            // check safety and poll read payload to buffer.
            buffer.poll_stream(cx)?;
        } else if !this.safety.is_clean() {
@ -496,6 +501,7 @@ impl fmt::Debug for Field {
 }

 struct InnerField {
+    /// Payload is initialized as Some and is `take`n when the field stream finishes.
    payload: Option<PayloadRef>,
    boundary: String,
    eof: bool,
@ -643,7 +649,12 @@ impl InnerField {
            return Poll::Ready(None);
        }

-        let result = if let Some(mut payload) = self.payload.as_ref().unwrap().get_mut(s) {
+        let result = if let Some(mut payload) = self
+            .payload
+            .as_ref()
+            .expect("Field should not be polled after completion")
+            .get_mut(s)
+        {
            if !self.eof {
                let res = if let Some(ref mut len) = self.length {
                    InnerField::read_len(&mut payload, len)
@ -674,8 +685,10 @@ impl InnerField {
        };

        if let Poll::Ready(None) = result {
-            self.payload.take();
+            // drop payload buffer and make future un-poll-able
+            let _ = self.payload.take();
        }
+
        result
    }
 }
--- a/actix-router/Cargo.toml
+++ b/actix-router/Cargo.toml
@ -12,9 +12,11 @@ repository = "https://github.com/actix/actix-web"
 license = "MIT OR Apache-2.0"
 edition = "2021"

-[lib]
-name = "actix_router"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "http::*",
+    "serde::*",
+]

 [features]
 default = ["http", "unicode"]
--- a/actix-test/CHANGES.md
+++ b/actix-test/CHANGES.md
@ -2,6 +2,10 @@

 ## Unreleased

+## 0.1.5
+
+- Add `TestServerConfig::listen_address()` method.
+
 ## 0.1.4

 - Add `TestServerConfig::rustls_0_23()` method for Rustls v0.23 support behind new `rustls-0_23` crate feature.
--- a/actix-test/Cargo.toml
+++ b/actix-test/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "actix-test"
-version = "0.1.4"
+version = "0.1.5"
 authors = [
    "Nikolay Kim <fafhrd91@gmail.com>",
    "Rob Ede <robjtede@icloud.com>",
@ -18,6 +18,22 @@ categories = [
 license = "MIT OR Apache-2.0"
 edition = "2021"

+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_codec::*",
+    "actix_http_test::*",
+    "actix_http::*",
+    "actix_service::*",
+    "actix_web::*",
+    "awc::*",
+    "bytes::*",
+    "futures_core::*",
+    "http::*",
+    "openssl::*",
+    "rustls::*",
+    "tokio::*",
+]
+
 [features]
 default = []

--- a/actix-test/README.md
+++ b/actix-test/README.md
@ -0,0 +1,45 @@
+# `actix-test`
+
+<!-- prettier-ignore-start -->
+
+[![crates.io](https://img.shields.io/crates/v/actix-test?label=latest)](https://crates.io/crates/actix-test)
+[![Documentation](https://docs.rs/actix-test/badge.svg?version=0.1.5)](https://docs.rs/actix-test/0.1.5)
+![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-test.svg)
+<br />
+[![dependency status](https://deps.rs/crate/actix-test/0.1.5/status.svg)](https://deps.rs/crate/actix-test/0.1.5)
+[![Download](https://img.shields.io/crates/d/actix-test.svg)](https://crates.io/crates/actix-test)
+[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
+
+<!-- prettier-ignore-end -->
+
+<!-- cargo-rdme start -->
+
+Integration testing tools for Actix Web applications.
+
+The main integration testing tool is [`TestServer`]. It spawns a real HTTP server on an unused port and provides methods that use a real HTTP client. Therefore, it is much closer to real-world cases than using `init_service`, which skips HTTP encoding and decoding.
+
+## Examples
+
+```rust
+use actix_web::{get, web, test, App, HttpResponse, Error, Responder};
+
+#[get("/")]
+async fn my_handler() -> Result<impl Responder, Error> {
+    Ok(HttpResponse::Ok())
+}
+
+#[actix_rt::test]
+async fn test_example() {
+    let srv = actix_test::start(||
+        App::new().service(my_handler)
+    );
+
+    let req = srv.get("/");
+    let res = req.send().await.unwrap();
+
+    assert!(res.status().is_success());
+}
+```
+
+<!-- cargo-rdme end -->
--- a/actix-test/src/lib.rs
+++ b/actix-test/src/lib.rs
@ -5,6 +5,7 @@
 //! real-world cases than using `init_service`, which skips HTTP encoding and decoding.
 //!
 //! # Examples
+//!
 //! ```
 //! use actix_web::{get, web, test, App, HttpResponse, Error, Responder};
 //!
@ -154,7 +155,7 @@ where
    // run server in separate orphaned thread
    thread::spawn(move || {
        rt::System::new().block_on(async move {
-            let tcp = net::TcpListener::bind(("127.0.0.1", cfg.port)).unwrap();
+            let tcp = net::TcpListener::bind((cfg.listen_address.clone(), cfg.port)).unwrap();
            let local_addr = tcp.local_addr().unwrap();
            let factory = factory.clone();
            let srv_cfg = cfg.clone();
@ -514,6 +515,7 @@ pub struct TestServerConfig {
    tp: HttpVer,
    stream: StreamType,
    client_request_timeout: Duration,
+    listen_address: String,
    port: u16,
    workers: usize,
    disable_redirects: bool,
@ -532,6 +534,7 @@ impl TestServerConfig {
            tp: HttpVer::Both,
            stream: StreamType::Tcp,
            client_request_timeout: Duration::from_secs(5),
+            listen_address: "127.0.0.1".to_string(),
            port: 0,
            workers: 1,
            disable_redirects: false,
@ -607,6 +610,14 @@ impl TestServerConfig {
        self
    }

+    /// Sets the address the server will listen on.
+    ///
+    /// By default, only listens on `127.0.0.1`.
+    pub fn listen_address(mut self, addr: impl Into<String>) -> Self {
+        self.listen_address = addr.into();
+        self
+    }
+
    /// Sets test server port.
    ///
    /// By default, a random free port is determined by the OS.
@ -657,9 +668,9 @@ impl TestServer {
        let scheme = if self.tls { "https" } else { "http" };

        if uri.starts_with('/') {
-            format!("{}://localhost:{}{}", scheme, self.addr.port(), uri)
+            format!("{}://{}{}", scheme, self.addr, uri)
        } else {
-            format!("{}://localhost:{}/{}", scheme, self.addr.port(), uri)
+            format!("{}://{}/{}", scheme, self.addr, uri)
        }
    }

--- a/actix-web-actors/CHANGES.md
+++ b/actix-web-actors/CHANGES.md
@ -2,6 +2,7 @@

 ## Unreleased

+- Take the encoded buffer when yielding bytes in the response stream rather than splitting the buffer, reducing memory use
 - Minimum supported Rust version (MSRV) is now 1.72.

 ## 4.3.0
--- a/actix-web-actors/Cargo.toml
+++ b/actix-web-actors/Cargo.toml
@ -9,9 +9,15 @@ repository = "https://github.com/actix/actix-web"
 license = "MIT OR Apache-2.0"
 edition = "2021"

-[lib]
-name = "actix_web_actors"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix::*",
+    "actix_http::*",
+    "actix_web::*",
+    "bytes::*",
+    "bytestring::*",
+    "futures_core::*",
+]

 [dependencies]
 actix = { version = ">=0.12, <0.14", default-features = false }
--- a/actix-web-actors/src/ws.rs
+++ b/actix-web-actors/src/ws.rs
@ -710,7 +710,7 @@ where
        }

        if !this.buf.is_empty() {
-            Poll::Ready(Some(Ok(this.buf.split().freeze())))
+            Poll::Ready(Some(Ok(std::mem::take(&mut this.buf).freeze())))
        } else if this.fut.alive() && !this.closed {
            Poll::Pending
        } else {
--- a/actix-web/CHANGES.md
+++ b/actix-web/CHANGES.md
@ -2,10 +2,24 @@

 ## Unreleased

+## 4.8.0
+
+### Added
+
+- Add `web::Html` responder.
+- Add `HttpRequest::full_url()` method to get the complete URL of the request.
+
+### Fixed
+
+- Always remove port from return value of `ConnectionInfo::realip_remote_addr()` when handling IPv6 addresses. from the `Forwarded` header.
+- The `UrlencodedError::ContentType` variant (relevant to the `Form` extractor) now uses the 415 (Media Type Unsupported) status code in it's `ResponseError` implementation.
+- Apply `HttpServer::max_connection_rate()` setting when using rustls v0.22 or v0.23.
+
 ## 4.7.0

 ### Added

+- Add `#[scope]` macro.
 - Add `middleware::Identity` type.
 - Add `CustomizeResponder::add_cookie()` method.
 - Add `guard::GuardContext::app_data()` method.
--- a/actix-web/Cargo.toml
+++ b/actix-web/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "4.7.0"
+version = "4.8.0"
 description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
 authors = [
    "Nikolay Kim <fafhrd91@gmail.com>",
@ -35,9 +35,31 @@ features = [
    "secure-cookies",
 ]

-[lib]
-name = "actix_web"
-path = "src/lib.rs"
+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_http::*",
+    "actix_router::*",
+    "actix_rt::*",
+    "actix_server::*",
+    "actix_service::*",
+    "actix_utils::*",
+    "actix_web_codegen::*",
+    "bytes::*",
+    "cookie::*",
+    "cookie",
+    "futures_core::*",
+    "http::*",
+    "language_tags::*",
+    "mime::*",
+    "openssl::*",
+    "rustls::*",
+    "serde_json::*",
+    "serde_urlencoded::*",
+    "serde::*",
+    "serde::*",
+    "tokio::*",
+    "url::*",
+]

 [features]
 default = [
@ -71,18 +93,18 @@ secure-cookies = ["cookies", "cookie/secure"]
 http2 = ["actix-http/http2"]

 # TLS via OpenSSL
-openssl = ["http2", "actix-http/openssl", "actix-tls/accept", "actix-tls/openssl"]
+openssl = ["__tls", "http2", "actix-http/openssl", "actix-tls/accept", "actix-tls/openssl"]

 # TLS via Rustls v0.20
 rustls = ["rustls-0_20"]
 # TLS via Rustls v0.20
-rustls-0_20 = ["http2", "actix-http/rustls-0_20", "actix-tls/accept", "actix-tls/rustls-0_20"]
+rustls-0_20 = ["__tls", "http2", "actix-http/rustls-0_20", "actix-tls/accept", "actix-tls/rustls-0_20"]
 # TLS via Rustls v0.21
-rustls-0_21 = ["http2", "actix-http/rustls-0_21", "actix-tls/accept", "actix-tls/rustls-0_21"]
+rustls-0_21 = ["__tls", "http2", "actix-http/rustls-0_21", "actix-tls/accept", "actix-tls/rustls-0_21"]
 # TLS via Rustls v0.22
-rustls-0_22 = ["http2", "actix-http/rustls-0_22", "actix-tls/accept", "actix-tls/rustls-0_22"]
+rustls-0_22 = ["__tls", "http2", "actix-http/rustls-0_22", "actix-tls/accept", "actix-tls/rustls-0_22"]
 # TLS via Rustls v0.23
-rustls-0_23 = ["http2", "actix-http/rustls-0_23", "actix-tls/accept", "actix-tls/rustls-0_23"]
+rustls-0_23 = ["__tls", "http2", "actix-http/rustls-0_23", "actix-tls/accept", "actix-tls/rustls-0_23"]

 # Full unicode support
 unicode = ["dep:regex", "actix-router/unicode"]
@ -91,6 +113,10 @@ unicode = ["dep:regex", "actix-router/unicode"]
 # Don't rely on these whatsoever. They may disappear at anytime.
 __compress = []

+# Internal (PRIVATE!) features used to aid checking feature status.
+# Don't rely on these whatsoever. They may disappear at anytime.
+__tls = []
+
 # io-uring feature only available for Linux OSes.
 experimental-io-uring = ["actix-server/io-uring"]

--- a/actix-web/README.md
+++ b/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.7.0)](https://docs.rs/actix-web/4.7.0)
+[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.8.0)](https://docs.rs/actix-web/4.8.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.7.0/status.svg)](https://deps.rs/crate/actix-web/4.7.0)
+[![Dependency Status](https://deps.rs/crate/actix-web/4.8.0/status.svg)](https://deps.rs/crate/actix-web/4.8.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/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web)
@ -109,4 +109,4 @@ This project is licensed under either of the following licenses, at your option:

 ## Code of Conduct

-Contribution to the actix-web repo is organized under the terms of the Contributor Covenant. The Actix team promises to intervene to uphold that code of conduct.
+Contribution to the `actix/actix-web` repo is organized under the terms of the Contributor Covenant. The Actix team promises to intervene to uphold that code of conduct.
--- a/actix-web/src/app.rs
+++ b/actix-web/src/app.rs
@ -234,7 +234,6 @@ where
    ///
    /// * *Resource* is an entry in resource table which corresponds to requested URL.
    /// * *Scope* is a set of resources with common root path.
-    /// * "StaticFiles" is a service for static files support
    pub fn service<F>(mut self, factory: F) -> Self
    where
        F: HttpServiceFactory + 'static,
--- a/actix-web/src/error/mod.rs
+++ b/actix-web/src/error/mod.rs
@ -100,6 +100,7 @@ impl ResponseError for UrlencodedError {
        match self {
            Self::Overflow { .. } => StatusCode::PAYLOAD_TOO_LARGE,
            Self::UnknownLength => StatusCode::LENGTH_REQUIRED,
+            Self::ContentType => StatusCode::UNSUPPORTED_MEDIA_TYPE,
            Self::Payload(err) => err.status_code(),
            _ => StatusCode::BAD_REQUEST,
        }
@ -232,7 +233,7 @@ mod tests {
        let resp = UrlencodedError::UnknownLength.error_response();
        assert_eq!(resp.status(), StatusCode::LENGTH_REQUIRED);
        let resp = UrlencodedError::ContentType.error_response();
-        assert_eq!(resp.status(), StatusCode::BAD_REQUEST);
+        assert_eq!(resp.status(), StatusCode::UNSUPPORTED_MEDIA_TYPE);
    }

    #[test]
--- a/actix-web/src/info.rs
+++ b/actix-web/src/info.rs
@ -21,6 +21,20 @@ fn unquote(val: &str) -> &str {
    val.trim().trim_start_matches('"').trim_end_matches('"')
 }

+/// Remove port and IPv6 square brackets from a peer specification.
+fn bare_address(val: &str) -> &str {
+    if val.starts_with('[') {
+        val.split("]:")
+            .next()
+            .map(|s| s.trim_start_matches('[').trim_end_matches(']'))
+            // this indicates that the IPv6 address is malformed so shouldn't
+            // usually happen, but if it does, just return the original input
+            .unwrap_or(val)
+    } else {
+        val.split(':').next().unwrap_or(val)
+    }
+}
+
 /// Extracts and trims first value for given header name.
 fn first_header_value<'a>(req: &'a RequestHead, name: &'_ HeaderName) -> Option<&'a str> {
    let hdr = req.headers.get(name)?.to_str().ok()?;
@ -100,7 +114,7 @@ impl ConnectionInfo {
            // --- https://datatracker.ietf.org/doc/html/rfc7239#section-5.2

            match name.trim().to_lowercase().as_str() {
-                "for" => realip_remote_addr.get_or_insert_with(|| unquote(val)),
+                "for" => realip_remote_addr.get_or_insert_with(|| bare_address(unquote(val))),
                "proto" => scheme.get_or_insert_with(|| unquote(val)),
                "host" => host.get_or_insert_with(|| unquote(val)),
                "by" => {
@ -368,16 +382,25 @@ mod tests {
            .insert_header((header::FORWARDED, r#"for="192.0.2.60:8080""#))
            .to_http_request();
        let info = req.connection_info();
-        assert_eq!(info.realip_remote_addr(), Some("192.0.2.60:8080"));
+        assert_eq!(info.realip_remote_addr(), Some("192.0.2.60"));
    }

    #[test]
    fn forwarded_for_ipv6() {
+        let req = TestRequest::default()
+            .insert_header((header::FORWARDED, r#"for="[2001:db8:cafe::17]""#))
+            .to_http_request();
+        let info = req.connection_info();
+        assert_eq!(info.realip_remote_addr(), Some("2001:db8:cafe::17"));
+    }
+
+    #[test]
+    fn forwarded_for_ipv6_with_port() {
        let req = TestRequest::default()
            .insert_header((header::FORWARDED, r#"for="[2001:db8:cafe::17]:4711""#))
            .to_http_request();
        let info = req.connection_info();
-        assert_eq!(info.realip_remote_addr(), Some("[2001:db8:cafe::17]:4711"));
+        assert_eq!(info.realip_remote_addr(), Some("2001:db8:cafe::17"));
    }

    #[test]
--- a/actix-web/src/request.rs
+++ b/actix-web/src/request.rs
@ -91,6 +91,35 @@ impl HttpRequest {
        &self.head().uri
    }

+    /// Returns request's original full URL.
+    ///
+    /// Reconstructed URL is best-effort, using [`connection_info`](HttpRequest::connection_info())
+    /// to get forwarded scheme & host.
+    ///
+    /// ```
+    /// use actix_web::test::TestRequest;
+    /// let req = TestRequest::with_uri("http://10.1.2.3:8443/api?id=4&name=foo")
+    ///     .insert_header(("host", "example.com"))
+    ///     .to_http_request();
+    ///
+    /// assert_eq!(
+    ///     req.full_url().as_str(),
+    ///     "http://example.com/api?id=4&name=foo",
+    /// );
+    /// ```
+    pub fn full_url(&self) -> url::Url {
+        let info = self.connection_info();
+        let scheme = info.scheme();
+        let host = info.host();
+        let path_and_query = self
+            .uri()
+            .path_and_query()
+            .map(|paq| paq.as_str())
+            .unwrap_or("/");
+
+        url::Url::parse(&format!("{scheme}://{host}{path_and_query}")).unwrap()
+    }
+
    /// Read the Request method.
    #[inline]
    pub fn method(&self) -> &Method {
@ -963,4 +992,27 @@ mod tests {

        assert!(format!("{:?}", req).contains(location_header));
    }
+
+    #[test]
+    fn check_full_url() {
+        let req = TestRequest::with_uri("/api?id=4&name=foo").to_http_request();
+        assert_eq!(
+            req.full_url().as_str(),
+            "http://localhost:8080/api?id=4&name=foo",
+        );
+
+        let req = TestRequest::with_uri("https://example.com/api?id=4&name=foo").to_http_request();
+        assert_eq!(
+            req.full_url().as_str(),
+            "https://example.com/api?id=4&name=foo",
+        );
+
+        let req = TestRequest::with_uri("http://10.1.2.3:8443/api?id=4&name=foo")
+            .insert_header(("host", "example.com"))
+            .to_http_request();
+        assert_eq!(
+            req.full_url().as_str(),
+            "http://example.com/api?id=4&name=foo",
+        );
+    }
 }
--- a/actix-web/src/scope.rs
+++ b/actix-web/src/scope.rs
@ -213,7 +213,6 @@ where
    ///
    /// * *Resource* is an entry in resource table which corresponds to requested URL.
    /// * *Scope* is a set of resources with common root path.
-    /// * "StaticFiles" is a service for static files support
    ///
    /// ```
    /// use actix_web::{web, App, HttpRequest};
--- a/actix-web/src/server.rs
+++ b/actix-web/src/server.rs
@ -7,13 +7,7 @@ use std::{
    time::Duration,
 };

-#[cfg(any(
-    feature = "openssl",
-    feature = "rustls-0_20",
-    feature = "rustls-0_21",
-    feature = "rustls-0_22",
-    feature = "rustls-0_23",
-))]
+#[cfg(feature = "__tls")]
 use actix_http::TlsAcceptorConfig;
 use actix_http::{body::MessageBody, Extensions, HttpService, KeepAlive, Request, Response};
 use actix_server::{Server, ServerBuilder};
@ -190,7 +184,7 @@ where
    /// By default max connections is set to a 256.
    #[allow(unused_variables)]
    pub fn max_connection_rate(self, num: usize) -> Self {
-        #[cfg(any(feature = "rustls-0_20", feature = "rustls-0_21", feature = "openssl"))]
+        #[cfg(feature = "__tls")]
        actix_tls::accept::max_concurrent_tls_connect(num);
        self
    }
@ -243,13 +237,7 @@ where
    /// time, the connection is closed.
    ///
    /// By default, the handshake timeout is 3 seconds.
-    #[cfg(any(
-        feature = "openssl",
-        feature = "rustls-0_20",
-        feature = "rustls-0_21",
-        feature = "rustls-0_22",
-        feature = "rustls-0_23",
-    ))]
+    #[cfg(feature = "__tls")]
    pub fn tls_handshake_timeout(self, dur: Duration) -> Self {
        self.config
            .lock()
--- a/actix-web/src/types/html.rs
+++ b/actix-web/src/types/html.rs
@ -0,0 +1,66 @@
+//! Semantic HTML responder. See [`Html`].
+
+use crate::{
+    http::{
+        header::{self, ContentType, TryIntoHeaderValue},
+        StatusCode,
+    },
+    HttpRequest, HttpResponse, Responder,
+};
+
+/// Semantic HTML responder.
+///
+/// When used as a responder, creates a 200 OK response, sets the correct HTML content type, and
+/// uses the string passed to [`Html::new()`] as the body.
+///
+/// ```
+/// # use actix_web::web::Html;
+/// Html::new("<p>Hello, World!</p>")
+/// # ;
+/// ```
+#[derive(Debug, Clone, PartialEq, Hash)]
+pub struct Html(String);
+
+impl Html {
+    /// Constructs a new `Html` responder.
+    pub fn new(html: impl Into<String>) -> Self {
+        Self(html.into())
+    }
+}
+
+impl Responder for Html {
+    type Body = String;
+
+    fn respond_to(self, _req: &HttpRequest) -> HttpResponse<Self::Body> {
+        let mut res = HttpResponse::with_body(StatusCode::OK, self.0);
+        res.headers_mut().insert(
+            header::CONTENT_TYPE,
+            ContentType::html().try_into_value().unwrap(),
+        );
+        res
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::test::TestRequest;
+
+    #[test]
+    fn responder() {
+        let req = TestRequest::default().to_http_request();
+
+        let res = Html::new("<p>Hello, World!</p>");
+        let res = res.respond_to(&req);
+
+        assert!(res.status().is_success());
+        assert!(res
+            .headers()
+            .get(header::CONTENT_TYPE)
+            .unwrap()
+            .to_str()
+            .unwrap()
+            .starts_with("text/html"));
+        assert!(res.body().starts_with("<p>"));
+    }
+}
--- a/actix-web/src/types/mod.rs
+++ b/actix-web/src/types/mod.rs
@ -3,6 +3,7 @@
 mod either;
 mod form;
 mod header;
+mod html;
 mod json;
 mod path;
 mod payload;
@ -13,6 +14,7 @@ pub use self::{
    either::Either,
    form::{Form, FormConfig, UrlEncoded},
    header::Header,
+    html::Html,
    json::{Json, JsonBody, JsonConfig},
    path::{Path, PathConfig},
    payload::{Payload, PayloadConfig},
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@ -15,10 +15,6 @@ repository = "https://github.com/actix/actix-web"
 license = "MIT OR Apache-2.0"
 edition = "2021"

-[lib]
-name = "awc"
-path = "src/lib.rs"
-
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 features = [
@ -33,6 +29,27 @@ features = [
    "compress-zstd",
 ]

+[package.metadata.cargo_check_external_types]
+allowed_external_types = [
+    "actix_codec::*",
+    "actix_http::*",
+    "actix_rt::*",
+    "actix_service::*",
+    "actix_tls::*",
+    "bytes::*",
+    "cookie::*",
+    "cookie",
+    "futures_core::*",
+    "h2::*",
+    "http::*",
+    "openssl::*",
+    "rustls::*",
+    "serde_json::*",
+    "serde_urlencoded::*",
+    "serde::*",
+    "tokio::*",
+]
+
 [features]
 default = ["compress-brotli", "compress-gzip", "compress-zstd", "cookies"]

@ -92,7 +109,7 @@ cfg-if = "1"
 derive_more = "0.99.5"
 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.24"
+h2 = "0.3.26"
 http = "0.2.7"
 itoa = "1"
 log =" 0.4"
@ -134,7 +151,7 @@ rcgen = "0.13"
 rustls-pemfile = "2"
 tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros"] }
 zstd = "0.13"
-tls-rustls-0_23 = { package = "rustls", version = "0.23" } # add rustls 0.23 with default features to make aws_lc_rs work in tests 
+tls-rustls-0_23 = { package = "rustls", version = "0.23" } # add rustls 0.23 with default features to make aws_lc_rs work in tests

 [[example]]
 name = "client"
--- a/79
+++ b/79
@ -22,7 +22,7 @@ non_linux_all_features_list := ```
    cargo metadata --format-version=1 \
    | jq '.packages[] | select(.source == null) | .features | keys' \
    | jq -r --slurp \
-        --arg exclusions "tokio-uring,io-uring,experimental-io-uring" \
+        --arg exclusions "__tls,__compress,tokio-uring,io-uring,experimental-io-uring" \
        'add | unique | . - ($exclusions | split(",")) | join(",")'
 ```

@ -32,6 +32,14 @@ all_crate_features := if os() == "linux" {
    "--features='" + non_linux_all_features_list + "'"
 }

+[private]
+check-min:
+    cargo hack --workspace check --no-default-features
+
+[private]
+check-default:
+    cargo hack --workspace check
+
 # Run Clippy over workspace.
 clippy toolchain="":
    cargo {{ toolchain }} clippy --workspace --all-targets {{ all_crate_features }}
@ -53,9 +61,32 @@ test-docs toolchain="": && doc
 # Test workspace.
 test-all toolchain="": (test toolchain) (test-docs toolchain)

+# Test workspace and collect coverage info.
+[private]
+test-coverage toolchain="":
+    cargo {{ toolchain }} llvm-cov nextest --no-report {{ all_crate_features }}
+    cargo {{ toolchain }} llvm-cov --doc --no-report {{ all_crate_features }}
+
+# Test workspace and generate Codecov report.
+test-coverage-codecov toolchain="": (test-coverage toolchain)
+    cargo {{ toolchain }} llvm-cov report --doctests --codecov --output-path=codecov.json
+
+# Test workspace and generate LCOV report.
+test-coverage-lcov toolchain="": (test-coverage toolchain)
+    cargo {{ toolchain }} llvm-cov report --doctests --lcov --output-path=lcov.info
+
 # Document crates in workspace.
-doc *args:
-    RUSTDOCFLAGS="--cfg=docsrs -Dwarnings" cargo +nightly doc --no-deps --workspace {{ all_crate_features }} {{ args }}
+doc *args: && doc-set-workspace-crates
+    RUSTDOCFLAGS="--cfg=docsrs -Dwarnings" cargo +nightly doc --workspace {{ all_crate_features }} {{ args }}
+
+[private]
+doc-set-workspace-crates:
+    #!/usr/bin/env bash
+    (
+        echo "window.ALL_CRATES ="
+        cargo metadata --format-version=1 | jq '[.packages[] | select(.source == null) | .name]'
+        echo ";"
+    ) > "$(cargo metadata --format-version=1 | jq -r '.target_directory')/doc/crates.js"

 # Document crates in workspace and watch for changes.
 doc-watch:
@ -65,4 +96,46 @@ doc-watch:
 # Update READMEs from crate root documentation.
 update-readmes: && fmt
    cd ./actix-files && cargo rdme --force
+    cd ./actix-http-test && cargo rdme --force
    cd ./actix-router && cargo rdme --force
+    cd ./actix-multipart && cargo rdme --force
+    cd ./actix-test && cargo rdme --force
+
+feature_combo_skip_list := if os() == "linux" {
+    "__tls,__compress"
+} else {
+    "__tls,__compress,experimental-io-uring"
+}
+
+# Checks compatibility of feature combinations.
+check-feature-combinations:
+    cargo hack --workspace \
+        --feature-powerset --depth=4 \
+        --skip={{ feature_combo_skip_list }} \
+        check
+
+# Check for unintentional external type exposure on all crates in workspace.
+check-external-types-all toolchain="+nightly":
+    #!/usr/bin/env bash
+    set -euo pipefail
+    exit=0
+    for f in $(find . -mindepth 2 -maxdepth 2 -name Cargo.toml | grep -vE "\-codegen/|\-derive/|\-macros/"); do
+        if ! just check-external-types-manifest "$f" {{toolchain}}; then exit=1; fi
+        echo
+        echo
+    done
+    exit $exit
+
+# Check for unintentional external type exposure on all crates in workspace.
+check-external-types-all-table toolchain="+nightly":
+    #!/usr/bin/env bash
+    set -euo pipefail
+    for f in $(find . -mindepth 2 -maxdepth 2 -name Cargo.toml | grep -vE "\-codegen/|\-derive/|\-macros/"); do
+        echo
+        echo "Checking for $f"
+        just check-external-types-manifest "$f" {{toolchain}} --output-format=markdown-table
+    done
+
+# Check for unintentional external type exposure on a crate.
+check-external-types-manifest manifest_path toolchain="+nightly" *extra_args="":
+    cargo {{toolchain}} check-external-types --manifest-path "{{manifest_path}}" {{extra_args}}
Author	SHA1	Message	Date
Rob Ede	4222f92bd3	chore(actix-web): prepare release 4.8.0	2024-06-20 00:23:11 +01:00
Rob Ede	d92a73eacd	chore(actix-http): prepare release 3.8.0	2024-06-20 00:18:22 +01:00
Rob Ede	c612b5ce94	ci: fix checks	2024-06-20 00:13:42 +01:00
Rob Ede	cbb55ba27d	ci: use just for feature combos check	2024-06-20 00:04:35 +01:00
Yury Yarashevich	643d64581a	Fix Rustls 0.22 & 0.23 are limited to 256 handshakes per second. (#3408 )	2024-06-19 22:34:49 +00:00
dependabot[bot]	66905efd7b	build(deps): bump taiki-e/install-action from 2.38.0 to 2.39.1 (#3404 ) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.38.0 to 2.39.1. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/v2.38.0...v2.39.1) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-17 02:28:03 +00:00
dependabot[bot]	c076e34b5d	build(deps): bump codecov/codecov-action from 4.4.1 to 4.5.0 (#3405 ) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.4.1 to 4.5.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v4.4.1...v4.5.0) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-17 02:27:23 +00:00
dependabot[bot]	3ecaff5f5b	build(deps): bump taiki-e/cache-cargo-install-action from 1.2.2 to 2.0.1 (#3406 ) Bumps [taiki-e/cache-cargo-install-action](https://github.com/taiki-e/cache-cargo-install-action) from 1.2.2 to 2.0.1. - [Release notes](https://github.com/taiki-e/cache-cargo-install-action/releases) - [Changelog](https://github.com/taiki-e/cache-cargo-install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/cache-cargo-install-action/compare/v1.2.2...v2.0.1) --- updated-dependencies: - dependency-name: taiki-e/cache-cargo-install-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-17 00:28:10 +00:00
Nikolaos Chatzikonstantinou	fa74ab3dfb	remove references to StaticFiles (#3400 )	2024-06-14 01:51:29 +00:00
Rob Ede	188206a903	feat: Html responder (#3399 )	2024-06-11 00:36:46 +01:00
Rob Ede	0ce488e57a	docs: fix build	2024-06-10 23:54:16 +01:00
Rob Ede	132b84d3b1	docs(multipart): use cargo-rdme	2024-06-10 23:35:26 +01:00
Rob Ede	cc5030c542	docs(http-test): use cargo-rdme	2024-06-10 23:31:45 +01:00
Rob Ede	cd301a6932	docs: local docs doc everything but only list workspace crates	2024-06-10 23:30:51 +01:00
Rob Ede	4c4c279938	docs(test): intrgrate cargo-rdme	2024-06-10 23:23:38 +01:00
Rob Ede	0fd85bae2a	test: demonstrate panic in multipart forms (#3397 )	2024-06-10 21:51:53 +01:00
Rob Ede	9b3de1f1fe	ci: fix doctest coverage	2024-06-10 04:15:58 +01:00
Rob Ede	9553e7afff	ci: fix coverage	2024-06-10 04:08:10 +01:00
Rob Ede	d9579cf58a	test: coverage for doctests	2024-06-10 04:05:21 +01:00
Timo Caktu	7a2313cc4b	web: add `HttpRequest::full_url()` (#3096 ) * implemented function which returns full uir * changes added into the changelog * added test funtion for full_uri method * refactor: rename to full_url --------- Co-authored-by: Rob Ede <robjtede@icloud.com>	2024-06-10 02:49:50 +00:00
Rob Ede	2ee92d778e	ci: external types checking (#3175 )	2024-06-10 03:39:06 +01:00
Matt Palmer	59e42c1446	Return 415 rather than 400 on Urlencoded Content-Type mismatch (#3334 ) Co-authored-by: Rob Ede <robjtede@icloud.com>	2024-06-10 01:19:35 +00:00
Rob Ede	53086a90a6	build: add coverage recipes to justfile	2024-06-10 01:58:16 +01:00
dependabot[bot]	7f529e35b2	build(deps): bump actions-rust-lang/setup-rust-toolchain from 1.8.0 to 1.9.0 (#3395 ) build(deps): bump actions-rust-lang/setup-rust-toolchain Bumps [actions-rust-lang/setup-rust-toolchain](https://github.com/actions-rust-lang/setup-rust-toolchain) from 1.8.0 to 1.9.0. - [Release notes](https://github.com/actions-rust-lang/setup-rust-toolchain/releases) - [Changelog](https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions-rust-lang/setup-rust-toolchain/compare/v1.8.0...v1.9.0) --- updated-dependencies: - dependency-name: actions-rust-lang/setup-rust-toolchain dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-10 00:45:11 +00:00
dependabot[bot]	4908fd7dea	build(deps): bump taiki-e/install-action from 2.34.0 to 2.38.0 (#3396 ) Bumps [taiki-e/install-action](https://github.com/taiki-e/install-action) from 2.34.0 to 2.38.0. - [Release notes](https://github.com/taiki-e/install-action/releases) - [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/install-action/compare/v2.34.0...v2.38.0) --- updated-dependencies: - dependency-name: taiki-e/install-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-10 00:44:58 +00:00
Matt Palmer	a2b9823d9d	Strip non-address characters from Forwarded for= (#3343 ) * Strip non-address characters from Forwarded for= This is something of a followup to #2528, which asked for port information to not be included in when it was taken from the local socket. The header's element may optionally contain port information (https://datatracker.ietf.org/doc/html/rfc7239#section-6). However, as I understand it, is supposed to only contain an IP address, without port (per #2528). This PR corrects that discrepancy, making it easier to parse the result of this method in application code. There should not be any compatibility concerns, as anyone parsing the output of would already need to handle both port and portless cases anyway. * Update CHANGES.md --------- Co-authored-by: Rob Ede <robjtede@icloud.com>	2024-06-09 23:40:09 +00:00
Rob Ede	da56de4556	chore(actix-test): prepare release 0.1.5	2024-06-10 00:01:17 +01:00
Matt Palmer	758ae1dac1	actix-test: allow the configuration of the TestServer address (#3351 ) * actix-test: allow the configuration of the TestServer address This is useful if you're running (say) Selenium tests against a running TestServer, and the Selenium workers are Docker containers elsewhere in the network. Not a particularly common use case, perhaps, but one that I can attest happens every now and then. * Update CHANGES.md * Adjust default listen address to avoid test failures --------- Co-authored-by: Rob Ede <robjtede@icloud.com>	2024-06-09 19:07:08 +00:00
Rob Ede	37577dcb89	chore(actix-files): prepare release 0.6.6	2024-06-09 19:45:14 +01:00
dependabot[bot]	8b8eb4eae1	build(deps): update tokio-uring requirement from 0.4 to 0.5 (#3385 ) * build(deps): update tokio-uring requirement from 0.4 to 0.5 Updates the requirements on [tokio-uring](https://github.com/tokio-rs/tokio-uring) to permit the latest version. - [Release notes](https://github.com/tokio-rs/tokio-uring/releases) - [Changelog](https://github.com/tokio-rs/tokio-uring/blob/master/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/tokio-uring/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: tokio-uring dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * chore: narrow actix-server requirement --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob Ede <robjtede@icloud.com>	2024-06-09 17:37:42 +00:00
Samuel Marks	22593a1532	Re-export `http::status::InvalidStatusCode` (#3393 ) * [actix-http/src/lib.rs] Expose/re-export `http::status::InvalidStatusCode` * [actix-http/src/error.rs] Re-export `http::status::InvalidStatusCode` ; [actix-http/src/lib.rs] Revert	2024-06-09 05:07:56 +00:00
asonix	f7646bcc48	actix-web-actors: take the internal buffer when yielding (#3369 ) * actix-web-actors: take the internal buffer when yielding * actix-web-actors: Add CHANGES entry re: taking buffer	2024-06-09 05:04:42 +00:00
Rob Ede	8018983a68	docs: update changelog for #3393	2024-06-09 06:08:21 +01:00
Rob Ede	266834cf7c	chore: narrow h2 version	2024-06-09 04:51:53 +01:00
Rob Ede	40e1034566	docs: update changelog	2024-06-09 00:38:49 +01:00