add redirect option to NormalizePath

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,40 +3,34 @@ name: Bug Report
 about: Create a bug report.
 ---
 
-Your issue may already be reported! Please search on the [Actix Web issue tracker](https://github.com/actix/actix-web/issues) before creating one.
+Your issue may already be reported!
+Please search on the [Actix Web issue tracker](https://github.com/actix/actix-web/issues) before creating one.
 
 ## Expected Behavior
-
 <!--- If you're describing a bug, tell us what should happen -->
 <!--- If you're suggesting a change/improvement, tell us how it should work -->
 
 ## Current Behavior
-
 <!--- If describing a bug, tell us what happens instead of the expected behavior -->
 <!--- If suggesting a change/improvement, explain the difference from current behavior -->
 
 ## Possible Solution
-
 <!--- Not obligatory, but suggest a fix/reason for the bug, -->
 <!--- or ideas how to implement the addition or change -->
 
 ## Steps to Reproduce (for bugs)
-
 <!--- Provide a link to a live example, or an unambiguous set of steps to -->
 <!--- reproduce this bug. Include code to reproduce, if relevant -->
-
 1.
 2.
 3.
 4.
 
 ## Context
-
 <!--- How has this issue affected you? What are you trying to accomplish? -->
 <!--- Providing context helps us come up with a solution that is most useful in the real world -->
 
 ## Your Environment
-
 <!--- Include as many relevant details about the environment you experienced the bug in -->
 
 - Rust Version (I.e, output of `rustc -V`):

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,14 +2,12 @@
 <!-- Please fill out the following to get your PR reviewed quicker. -->
 
 ## PR Type
-
 <!-- What kind of change does this PR make? -->
 <!-- Bug Fix / Feature / Refactor / Code Style / Other -->
-
 PR_TYPE
 
-## PR Checklist
 
+## PR Checklist
 <!-- Check your PR fulfills the following items. -->
 <!-- For draft PRs check the boxes as you complete them. -->
 
@@ -19,10 +17,11 @@ PR_TYPE
 - [ ] Format code with the latest stable rustfmt.
 - [ ] (Team) Label with affected crates and semver status.
 
-## Overview
 
+## Overview
 <!-- Describe the current and new behavior. -->
 <!-- Emphasize any breaking changes. -->
 
+
 <!-- If this PR fixes or closes an issue, reference it here. -->
 <!-- Closes #000 -->

.github/workflows/bench.yml

@@ -5,19 +5,12 @@ on:
     branches:
       - master
 
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check_benchmark:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1

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

@@ -4,13 +4,6 @@ on:
   push:
     branches: [master]
 
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build_and_test_nightly:
     strategy:
@@ -33,7 +26,7 @@ jobs:
       CARGO_UNSTABLE_SPARSE_REGISTRY: true
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       # install OpenSSL on Windows
       # TODO: GitHub actions docs state that OpenSSL is
@@ -48,7 +41,7 @@ jobs:
       - name: Install ${{ matrix.version }}
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
           profile: minimal
           override: true
 
@@ -85,7 +78,7 @@ jobs:
 
       - name: Clear the cargo caches
         run: |
-          cargo install cargo-cache --version 0.8.3 --no-default-features --features ci-autoclean
+          cargo install cargo-cache --version 0.8.2 --no-default-features --features ci-autoclean
           cargo-cache
 
   ci_feature_powerset_check:
@@ -97,23 +90,31 @@ jobs:
       CARGO_INCREMENTAL: 0
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - uses: dtolnay/rust-toolchain@stable
+      - name: Install stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
 
       - name: Install cargo-hack
         uses: taiki-e/install-action@cargo-hack
 
       - name: Generate Cargo.lock
-        run: cargo generate-lockfile
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@v1.2.0
 
       - name: check feature combinations
-        run: cargo ci-check-all-feature-powerset
-
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-all-feature-powerset }
+      
       - name: check feature combinations
-        run: cargo ci-check-all-feature-powerset-linux
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-all-feature-powerset-linux }
 
   nextest:
     name: nextest
@@ -124,17 +125,26 @@ jobs:
       CARGO_INCREMENTAL: 0
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - uses: dtolnay/rust-toolchain@stable
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
 
       - name: Install nextest
         uses: taiki-e/install-action@nextest
 
       - name: Generate Cargo.lock
-        run: cargo generate-lockfile
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@v1.3.0
 
       - name: Test with cargo-nextest
-        run: cargo nextest run
+        uses: actions-rs/cargo@v1
+        with:
+          command: nextest
+          args: run

.github/workflows/ci.yml

@@ -6,13 +6,6 @@ on:
   push:
     branches: [master]
 
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build_and_test:
     strategy:
@@ -21,30 +14,38 @@ jobs:
         target:
           - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
-          - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
+          - { name: Windows, os: windows-2022, triple: x86_64-pc-windows-msvc }
         version:
-          - 1.59.0 # MSRV
+          - 1.57.0 # MSRV
           - stable
 
     name: ${{ matrix.target.name }} / ${{ matrix.version }}
     runs-on: ${{ matrix.target.os }}
 
-    env: {}
+    env:
+      CI: 1
+      CARGO_INCREMENTAL: 0
+      VCPKGRS_DYNAMIC: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
+      # install OpenSSL on Windows
+      # TODO: GitHub actions docs state that OpenSSL is
+      # already installed on these Windows machines somewhere
+      - name: Set vcpkg root
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc'
+        run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
       - name: Install OpenSSL
-        if: matrix.target.os == 'windows-latest'
-        run: choco install openssl
-      - name: Set OpenSSL dir in env
-        if: matrix.target.os == 'windows-latest'
-        run: echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc'
+        run: vcpkg install openssl:x64-windows
 
-      - name: Install Rust (${{ matrix.version }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install ${{ matrix.version }}
+        uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
+          profile: minimal
+          override: true
 
       - name: Install cargo-hack
         uses: taiki-e/install-action@cargo-hack
@@ -56,10 +57,11 @@ jobs:
           cargo add const-str@0.3 --dev -p=actix-web
           cargo add const-str@0.3 --dev -p=awc
 
-      - name: workaround MSRV issues
-        if: matrix.version != 'stable'
-        run: |
-          cargo update -p=zstd-sys --precise=2.0.1+zstd.1.5.2
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
 
       - name: check minimal
         uses: actions-rs/cargo@v1
@@ -85,35 +87,56 @@ jobs:
 
       - name: Clear the cargo caches
         run: |
-          cargo install cargo-cache --version 0.8.3 --no-default-features --features ci-autoclean
+          cargo install cargo-cache --version 0.8.2 --no-default-features --features ci-autoclean
           cargo-cache
 
   io-uring:
     name: io-uring tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: { toolchain: nightly }
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.3.0
 
       - name: tests (io-uring)
         timeout-minutes: 60
         run: >
-          sudo bash -c "ulimit -Sl 512 && ulimit -Hl 512 && PATH=$PATH:/usr/share/rust/.cargo/bin && RUSTUP_TOOLCHAIN=stable cargo test --lib --tests -p=actix-files --all-features"
-
+          sudo bash -c "ulimit -Sl 512
+          && ulimit -Hl 512
+          && PATH=$PATH:/usr/share/rust/.cargo/bin
+          && RUSTUP_TOOLCHAIN=stable cargo test --lib --tests -p=actix-files --all-features"
 
   rustdoc:
     name: doc tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: { toolchain: nightly }
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.3.0
 
       - name: doc tests
-        run: cargo ci-doctest
+        uses: actions-rs/cargo@v1
         timeout-minutes: 60
+        with: { command: ci-doctest }

.github/workflows/clippy-fmt.yml

@@ -4,72 +4,63 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: stable
+          profile: minimal
           components: rustfmt
-
-      - run: cargo fmt --all -- --check
+      - name: Check with rustfmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
 
   clippy:
-    permissions:
-      checks: write # to add clippy checks to PR diffs
-
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: { components: clippy }
-
-      - uses: giraffate/clippy-action@v1
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
         with:
-          reporter: 'github-pr-check'
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          clippy_flags: --workspace --all-features --tests --examples --bins -- -Dclippy::todo
+          toolchain: stable
+          profile: minimal
+          components: clippy
+          override: true
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
+
+      - name: Check with Clippy
+        uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --workspace --tests --examples --all-features
 
   lint-docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: { components: rust-docs }
-
-      - name: Check for broken intra-doc links
-        env: { RUSTDOCFLAGS: "-D warnings" }
-        run: cargo doc --no-deps --all-features --workspace
-
-  public-api-diff:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
         with:
-          ref: ${{ github.base_ref }}
-
-      - uses: actions/checkout@v3
-
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: { toolchain: nightly }
-
-      - uses: taiki-e/cache-cargo-install-action@v1
-        with: { tool: cargo-public-api }
-
-      - name: generate API diff
-        run: |
-          for f in $(find -mindepth 2 -maxdepth 2 -name Cargo.toml); do
-            cargo public-api --manifest-path "$f" diff ${{ github.event.pull_request.base.sha }}..${{ github.sha }}
-          done
+          toolchain: stable
+          profile: minimal
+          components: rust-docs
+      - name: Check for broken intra-doc links
+        uses: actions-rs/cargo@v1
+        env:
+          RUSTDOCFLAGS: "-D warnings"
+        with:
+          command: doc
+          args: --no-deps --all-features --workspace

.github/workflows/coverage.yml

@@ -6,23 +6,26 @@ on:
   push:
     branches: [master]
 
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   # job currently (1st Feb 2022) segfaults
   coverage:
     name: coverage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: { toolchain: nightly }
+      - name: Install stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
 
       - name: Generate coverage file
         run: |

.github/workflows/upload-doc.yml

@@ -4,35 +4,32 @@ on:
   push:
     branches: [master]
 
-permissions:
-  contents: read # to fetch code (actions/checkout)
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
-    permissions:
-      contents: write # to push changes in repo (jamesives/github-pages-deploy-action)
-
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
-      - uses: dtolnay/rust-toolchain@nightly
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
 
       - name: Build Docs
-        run: cargo +nightly doc --no-deps --workspace --all-features
-        env:
-          RUSTDOCFLAGS: --cfg=docsrs
+        uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --workspace --all-features --no-deps
 
       - name: Tweak HTML
         run: echo '<meta http-equiv="refresh" content="0;url=actix_web/index.html">' > target/doc/index.html
 
       - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@3.7.1
         with:
-          folder: target/doc
-          single-commit: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: target/doc

.prettierrc.json

@@ -0,0 +1,3 @@
+{
+    "proseWrap": "never"
+}

.prettierrc.yaml

@@ -1 +0,0 @@
-proseWrap: never

Cargo.toml

@@ -5,7 +5,6 @@ members = [
     "actix-http-test",
     "actix-http",
     "actix-multipart",
-    "actix-multipart-derive",
     "actix-router",
     "actix-test",
     "actix-web-actors",
@@ -28,7 +27,6 @@ actix-files = { path = "actix-files" }
 actix-http = { path = "actix-http" }
 actix-http-test = { path = "actix-http-test" }
 actix-multipart = { path = "actix-multipart" }
-actix-multipart-derive = { path = "actix-multipart-derive" }
 actix-router = { path = "actix-router" }
 actix-test = { path = "actix-test" }
 actix-web = { path = "actix-web" }

actix-files/CHANGES.md

@@ -1,24 +1,10 @@
 # Changes
 
-## Unreleased - 2023-xx-xx
-
-## 0.6.3 - 2023-01-21
-
-- XHTML files now use `Content-Disposition: inline` instead of `attachment`. [#2903]
-- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
-- Update `tokio-uring` dependency to `0.4`.
-
-[#2903]: https://github.com/actix/actix-web/pull/2903
-
-## 0.6.2 - 2022-07-23
-
-- Allow partial range responses for video content to start streaming sooner. [#2817]
+## Unreleased - 2022-xx-xx
 - Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency.
 
-[#2817]: https://github.com/actix/actix-web/pull/2817
 
 ## 0.6.1 - 2022-06-11
-
 - Add `NamedFile::{modified, metadata, content_type, content_disposition, encoding}()` getters. [#2021]
 - Update `tokio-uring` dependency to `0.3`.
 - Audio files now use `Content-Disposition: inline` instead of `attachment`. [#2645]
@@ -27,46 +13,46 @@
 [#2021]: https://github.com/actix/actix-web/pull/2021
 [#2645]: https://github.com/actix/actix-web/pull/2645
 
-## 0.6.0 - 2022-02-25
 
+## 0.6.0 - 2022-02-25
 - No significant changes since `0.6.0-beta.16`.
 
-## 0.6.0-beta.16 - 2022-01-31
 
+## 0.6.0-beta.16 - 2022-01-31
 - No significant changes since `0.6.0-beta.15`.
 
-## 0.6.0-beta.15 - 2022-01-21
 
+## 0.6.0-beta.15 - 2022-01-21
 - No significant changes since `0.6.0-beta.14`.
 
-## 0.6.0-beta.14 - 2022-01-14
 
+## 0.6.0-beta.14 - 2022-01-14
 - The `prefer_utf8` option introduced in `0.4.0` is now true by default. [#2583]
 
 [#2583]: https://github.com/actix/actix-web/pull/2583
 
-## 0.6.0-beta.13 - 2022-01-04
 
+## 0.6.0-beta.13 - 2022-01-04
 - The `Files` service now rejects requests with URL paths that include `%2F` (decoded: `/`). [#2398]
 - The `Files` service now correctly decodes `%25` in the URL path to `%` for the file path. [#2398]
 - Minimum supported Rust version (MSRV) is now 1.54.
 
 [#2398]: https://github.com/actix/actix-web/pull/2398
 
-## 0.6.0-beta.12 - 2021-12-29
 
+## 0.6.0-beta.12 - 2021-12-29
 - No significant changes since `0.6.0-beta.11`.
 
-## 0.6.0-beta.11 - 2021-12-27
 
+## 0.6.0-beta.11 - 2021-12-27
 - No significant changes since `0.6.0-beta.10`.
 
-## 0.6.0-beta.10 - 2021-12-11
 
+## 0.6.0-beta.10 - 2021-12-11
 - No significant changes since `0.6.0-beta.9`.
 
-## 0.6.0-beta.9 - 2021-11-22
 
+## 0.6.0-beta.9 - 2021-11-22
 - Add crate feature `experimental-io-uring`, enabling async file I/O to be utilized. This feature is only available on Linux OSes with recent kernel versions. This feature is semver-exempt. [#2408]
 - Add `NamedFile::open_async`. [#2408]
 - Fix 304 Not Modified responses to omit the Content-Length header, as per the spec. [#2453]
@@ -77,24 +63,24 @@
 [#2408]: https://github.com/actix/actix-web/pull/2408
 [#2453]: https://github.com/actix/actix-web/pull/2453
 
-## 0.6.0-beta.8 - 2021-10-20
 
+## 0.6.0-beta.8 - 2021-10-20
 - Minimum supported Rust version (MSRV) is now 1.52.
 
-## 0.6.0-beta.7 - 2021-09-09
 
+## 0.6.0-beta.7 - 2021-09-09
 - Minimum supported Rust version (MSRV) is now 1.51.
 
-## 0.6.0-beta.6 - 2021-06-26
 
+## 0.6.0-beta.6 - 2021-06-26
 - Added `Files::path_filter()`. [#2274]
 - `Files::show_files_listing()` can now be used with `Files::index_file()` to show files listing as a fallback when the index file is not found. [#2228]
 
 [#2274]: https://github.com/actix/actix-web/pull/2274
 [#2228]: https://github.com/actix/actix-web/pull/2228
 
-## 0.6.0-beta.5 - 2021-06-17
 
+## 0.6.0-beta.5 - 2021-06-17
 - `NamedFile` now implements `ServiceFactory` and `HttpServiceFactory` making it much more useful in routing. For example, it can be used directly as a default service. [#2135]
 - For symbolic links, `Content-Disposition` header no longer shows the filename of the original file. [#2156]
 - `Files::redirect_to_slash_directory()` now works as expected when used with `Files::show_files_listing()`. [#2225]
@@ -105,58 +91,58 @@
 [#2225]: https://github.com/actix/actix-web/pull/2225
 [#2257]: https://github.com/actix/actix-web/pull/2257
 
-## 0.6.0-beta.4 - 2021-04-02
 
+## 0.6.0-beta.4 - 2021-04-02
 - Add support for `.guard` in `Files` to selectively filter `Files` services. [#2046]
 
 [#2046]: https://github.com/actix/actix-web/pull/2046
 
-## 0.6.0-beta.3 - 2021-03-09
 
+## 0.6.0-beta.3 - 2021-03-09
 - No notable changes.
 
-## 0.6.0-beta.2 - 2021-02-10
 
+## 0.6.0-beta.2 - 2021-02-10
 - Fix If-Modified-Since and If-Unmodified-Since to not compare using sub-second timestamps. [#1887]
 - Replace `v_htmlescape` with `askama_escape`. [#1953]
 
 [#1887]: https://github.com/actix/actix-web/pull/1887
 [#1953]: https://github.com/actix/actix-web/pull/1953
 
-## 0.6.0-beta.1 - 2021-01-07
 
+## 0.6.0-beta.1 - 2021-01-07
 - `HttpRange::parse` now has its own error type.
 - Update `bytes` to `1.0`. [#1813]
 
 [#1813]: https://github.com/actix/actix-web/pull/1813
 
-## 0.5.0 - 2020-12-26
 
+## 0.5.0 - 2020-12-26
 - Optionally support hidden files/directories. [#1811]
 
 [#1811]: https://github.com/actix/actix-web/pull/1811
 
-## 0.4.1 - 2020-11-24
 
+## 0.4.1 - 2020-11-24
 - Clarify order of parameters in `Files::new` and improve docs.
 
-## 0.4.0 - 2020-10-06
 
+## 0.4.0 - 2020-10-06
 - Add `Files::prefer_utf8` option that adds UTF-8 charset on certain response types. [#1714]
 
 [#1714]: https://github.com/actix/actix-web/pull/1714
 
-## 0.3.0 - 2020-09-11
 
+## 0.3.0 - 2020-09-11
 - No significant changes from 0.3.0-beta.1.
 
-## 0.3.0-beta.1 - 2020-07-15
 
+## 0.3.0-beta.1 - 2020-07-15
 - Update `v_htmlescape` to 0.10
 - Update `actix-web` and `actix-http` dependencies to beta.1
 
-## 0.3.0-alpha.1 - 2020-05-23
 
+## 0.3.0-alpha.1 - 2020-05-23
 - Update `actix-web` and `actix-http` dependencies to alpha
 - Fix some typos in the docs
 - Bump minimum supported Rust version to 1.40
@@ -164,73 +150,73 @@
 
 [#1384]: https://github.com/actix/actix-web/pull/1384
 
-## 0.2.1 - 2019-12-22
 
+## 0.2.1 - 2019-12-22
 - Use the same format for file URLs regardless of platforms
 
-## 0.2.0 - 2019-12-20
 
+## 0.2.0 - 2019-12-20
 - Fix BodyEncoding trait import #1220
 
-## 0.2.0-alpha.1 - 2019-12-07
 
+## 0.2.0-alpha.1 - 2019-12-07
 - Migrate to `std::future`
 
-## 0.1.7 - 2019-11-06
 
-- Add an additional `filename*` param in the `Content-Disposition` header of `actix_files::NamedFile` to be more compatible. (#1151)
+## 0.1.7 - 2019-11-06
+- Add an additional `filename*` param in the `Content-Disposition` header of
+  `actix_files::NamedFile` to be more compatible. (#1151)
 
 ## 0.1.6 - 2019-10-14
-
 - Add option to redirect to a slash-ended path `Files` #1132
 
-## 0.1.5 - 2019-10-08
 
+## 0.1.5 - 2019-10-08
 - Bump up `mime_guess` crate version to 2.0.1
 - Bump up `percent-encoding` crate version to 2.1
 - Allow user defined request guards for `Files` #1113
 
-## 0.1.4 - 2019-07-20
 
+## 0.1.4 - 2019-07-20
 - Allow to disable `Content-Disposition` header #686
 
-## 0.1.3 - 2019-06-28
 
+## 0.1.3 - 2019-06-28
 - Do not set `Content-Length` header, let actix-http set it #930
 
-## 0.1.2 - 2019-06-13
 
+## 0.1.2 - 2019-06-13
 - Content-Length is 0 for NamedFile HEAD request #914
 - Fix ring dependency from actix-web default features for #741
 
-## 0.1.1 - 2019-06-01
 
+## 0.1.1 - 2019-06-01
 - Static files are incorrectly served as both chunked and with length #812
 
-## 0.1.0 - 2019-05-25
 
+## 0.1.0 - 2019-05-25
 - NamedFile last-modified check always fails due to nano-seconds in file modified date #820
 
-## 0.1.0-beta.4 - 2019-05-12
 
+## 0.1.0-beta.4 - 2019-05-12
 - Update actix-web to beta.4
 
-## 0.1.0-beta.1 - 2019-04-20
 
+## 0.1.0-beta.1 - 2019-04-20
 - Update actix-web to beta.1
 
-## 0.1.0-alpha.6 - 2019-04-14
 
+## 0.1.0-alpha.6 - 2019-04-14
 - Update actix-web to alpha6
 
-## 0.1.0-alpha.4 - 2019-04-08
 
+## 0.1.0-alpha.4 - 2019-04-08
 - Update actix-web to alpha4
 
-## 0.1.0-alpha.2 - 2019-04-02
 
+## 0.1.0-alpha.2 - 2019-04-02
 - Add default handler support
 
-## 0.1.0-alpha.1 - 2019-03-28
 
+## 0.1.0-alpha.1 - 2019-03-28
 - Initial impl

actix-files/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
 name = "actix-files"
-version = "0.6.3"
+version = "0.6.1"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
+    "fakeshadow <24548779@qq.com>",
     "Rob Ede <robjtede@icloud.com>",
 ]
 description = "Static file serving for Actix Web"
@@ -26,25 +27,25 @@ actix-service = "2"
 actix-utils = "3"
 actix-web = { version = "4", default-features = false }
 
+askama_escape = "0.10"
 bitflags = "1"
 bytes = "1"
 derive_more = "0.99.5"
-futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
+futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
 http-range = "0.1.4"
 log = "0.4"
-mime = "0.3.9"
+mime = "0.3"
 mime_guess = "2.0.1"
 percent-encoding = "2.1"
 pin-project-lite = "0.2.7"
-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.3", optional = true, features = ["bytes"] }
+actix-server = { version = "2.1", optional = true } # ensure matching tokio-uring versions
 
 [dev-dependencies]
 actix-rt = "2.7"
-actix-test = "0.1"
+actix-test = "0.1.0-beta.13"
 actix-web = "4"
 tempfile = "3.2"

actix-files/README.md

@@ -3,11 +3,11 @@
 > Static file serving for Actix Web
 
 [![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.3)](https://docs.rs/actix-files/0.6.3)
-![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
+[![Documentation](https://docs.rs/actix-files/badge.svg?version=0.6.1)](https://docs.rs/actix-files/0.6.1)
+![Version](https://img.shields.io/badge/rustc-1.57+-ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix-files.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-files/0.6.3/status.svg)](https://deps.rs/crate/actix-files/0.6.3)
+[![dependency status](https://deps.rs/crate/actix-files/0.6.1/status.svg)](https://deps.rs/crate/actix-files/0.6.1)
 [![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)
 
@@ -15,4 +15,4 @@
 
 - [API Documentation](https://docs.rs/actix-files)
 - [Example Project](https://github.com/actix/examples/tree/master/basics/static-files)
-- Minimum Supported Rust Version (MSRV): 1.59
+- Minimum Supported Rust Version (MSRV): 1.54

actix-files/src/directory.rs

@@ -1,8 +1,8 @@
 use std::{fmt::Write, fs::DirEntry, io, path::Path, path::PathBuf};
 
 use actix_web::{dev::ServiceResponse, HttpRequest, HttpResponse};
+use askama_escape::{escape as escape_html_entity, Html};
 use percent_encoding::{utf8_percent_encode, CONTROLS};
-use v_htmlescape::escape as escape_html_entity;
 
 /// A directory; responds with the generated directory listing.
 #[derive(Debug)]
@@ -59,7 +59,7 @@ macro_rules! encode_file_url {
 /// ```
 macro_rules! encode_file_name {
     ($entry:ident) => {
-        escape_html_entity(&$entry.file_name().to_string_lossy())
+        escape_html_entity(&$entry.file_name().to_string_lossy(), Html)
     };
 }
 

actix-files/src/error.rs

@@ -2,47 +2,48 @@ use actix_web::{http::StatusCode, ResponseError};
 use derive_more::Display;
 
 /// Errors which can occur when serving static files.
-#[derive(Debug, PartialEq, Eq, Display)]
+#[derive(Display, Debug, PartialEq)]
 pub enum FilesError {
-    /// Path is not a directory.
+    /// Path is not a directory
     #[allow(dead_code)]
-    #[display(fmt = "path is not a directory. Unable to serve static files")]
+    #[display(fmt = "Path is not a directory. Unable to serve static files")]
     IsNotDirectory,
 
-    /// Cannot render directory.
-    #[display(fmt = "unable to render directory without index file")]
+    /// Cannot render directory
+    #[display(fmt = "Unable to render directory without index file")]
     IsDirectory,
 }
 
+/// Return `NotFound` for `FilesError`
 impl ResponseError for FilesError {
-    /// Returns `404 Not Found`.
     fn status_code(&self) -> StatusCode {
         StatusCode::NOT_FOUND
     }
 }
 
-#[derive(Debug, PartialEq, Eq, Display)]
+#[allow(clippy::enum_variant_names)]
+#[derive(Display, Debug, PartialEq)]
 #[non_exhaustive]
 pub enum UriSegmentError {
-    /// Segment started with the wrapped invalid character.
-    #[display(fmt = "segment started with invalid character: ('{_0}')")]
+    /// The segment started with the wrapped invalid character.
+    #[display(fmt = "The segment started with the wrapped invalid character")]
     BadStart(char),
 
-    /// Segment contained the wrapped invalid character.
-    #[display(fmt = "segment contained invalid character ('{_0}')")]
+    /// The segment contained the wrapped invalid character.
+    #[display(fmt = "The segment contained the wrapped invalid character")]
     BadChar(char),
 
-    /// Segment ended with the wrapped invalid character.
-    #[display(fmt = "segment ended with invalid character: ('{_0}')")]
+    /// The segment ended with the wrapped invalid character.
+    #[display(fmt = "The segment ended with the wrapped invalid character")]
     BadEnd(char),
 
-    /// Path is not a valid UTF-8 string after percent-decoding.
-    #[display(fmt = "path is not a valid UTF-8 string after percent-decoding")]
+    /// The path is not a valid UTF-8 string after doing percent decoding.
+    #[display(fmt = "The path is not a valid UTF-8 string after percent-decoding")]
     NotValidUtf8,
 }
 
+/// Return `BadRequest` for `UriSegmentError`
 impl ResponseError for UriSegmentError {
-    /// Returns `400 Bad Request`.
     fn status_code(&self) -> StatusCode {
         StatusCode::BAD_REQUEST
     }

actix-files/src/files.rs

@@ -142,7 +142,7 @@ impl Files {
         self
     }
 
-    /// Set custom directory renderer.
+    /// Set custom directory renderer
     pub fn files_listing_renderer<F>(mut self, f: F) -> Self
     where
         for<'r, 's> F:
@@ -152,7 +152,7 @@ impl Files {
         self
     }
 
-    /// Specifies MIME override callback.
+    /// Specifies mime override callback
     pub fn mime_override<F>(mut self, f: F) -> Self
     where
         F: Fn(&mime::Name<'_>) -> DispositionType + 'static,
@@ -390,42 +390,3 @@ impl ServiceFactory<ServiceRequest> for Files {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use actix_web::{
-        http::StatusCode,
-        test::{self, TestRequest},
-        App, HttpResponse,
-    };
-
-    use super::*;
-
-    #[actix_web::test]
-    async fn custom_files_listing_renderer() {
-        let srv = test::init_service(
-            App::new().service(
-                Files::new("/", "./tests")
-                    .show_files_listing()
-                    .files_listing_renderer(|dir, req| {
-                        Ok(ServiceResponse::new(
-                            req.clone(),
-                            HttpResponse::Ok().body(dir.path.to_str().unwrap().to_owned()),
-                        ))
-                    }),
-            ),
-        )
-        .await;
-
-        let req = TestRequest::with_uri("/").to_request();
-        let res = test::call_service(&srv, req).await;
-
-        assert_eq!(res.status(), StatusCode::OK);
-        let body = test::read_body(res).await;
-        assert!(
-            body.ends_with(b"actix-files/tests/"),
-            "body {:?} does not end with `actix-files/tests/`",
-            body
-        );
-    }
-}

actix-files/src/lib.rs

@@ -13,10 +13,6 @@
 
 #![deny(rust_2018_idioms, nonstandard_style)]
 #![warn(future_incompatible, missing_docs, missing_debug_implementations)]
-#![allow(clippy::uninlined_format_args)]
-#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
-#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
 use actix_service::boxed::{BoxService, BoxServiceFactory};
 use actix_web::{

actix-files/src/named.rs

@@ -132,7 +132,7 @@ impl NamedFile {
                 mime::IMAGE | mime::TEXT | mime::AUDIO | mime::VIDEO => DispositionType::Inline,
                 mime::APPLICATION => match ct.subtype() {
                     mime::JAVASCRIPT | mime::JSON => DispositionType::Inline,
-                    name if name == "wasm" || name == "xhtml" => DispositionType::Inline,
+                    name if name == "wasm" => DispositionType::Inline,
                     _ => DispositionType::Attachment,
                 },
                 _ => DispositionType::Attachment,
@@ -528,26 +528,11 @@ impl NamedFile {
                     length = ranges[0].length;
                     offset = ranges[0].start;
 
-                    // When a Content-Encoding header is present in a 206 partial content response
-                    // for video content, it prevents browser video players from starting playback
-                    // before loading the whole video and also prevents seeking.
-                    //
-                    // See: https://github.com/actix/actix-web/issues/2815
-                    //
-                    // The assumption of this fix is that the video player knows to not send an
-                    // Accept-Encoding header for this request and that downstream middleware will
-                    // not attempt compression for requests without it.
-                    //
-                    // TODO: Solve question around what to do if self.encoding is set and partial
-                    // range is requested. Reject request? Ignoring self.encoding seems wrong, too.
-                    // In practice, it should not come up.
-                    if req.headers().contains_key(&header::ACCEPT_ENCODING) {
-                        // don't allow compression middleware to modify partial content
-                        res.insert_header((
-                            header::CONTENT_ENCODING,
-                            HeaderValue::from_static("identity"),
-                        ));
-                    }
+                    // don't allow compression middleware to modify partial content
+                    res.insert_header((
+                        header::CONTENT_ENCODING,
+                        HeaderValue::from_static("identity"),
+                    ));
 
                     res.insert_header((
                         header::CONTENT_RANGE,

actix-files/src/path_buf.rs

@@ -30,7 +30,7 @@ impl PathBufWrap {
         let mut segment_count = path.matches('/').count() + 1;
 
         // we can decode the whole path here (instead of per-segment decoding)
-        // because we will reject `%2F` in paths using `segment_count`.
+        // because we will reject `%2F` in paths using `segement_count`.
         let path = percent_encoding::percent_decode_str(path)
             .decode_utf8()
             .map_err(|_| UriSegmentError::NotValidUtf8)?;

actix-files/src/range.rs

@@ -1,36 +1,4 @@
-use std::fmt;
-
-use derive_more::Error;
-
-/// Copy of `http_range::HttpRangeParseError`.
-#[derive(Debug, Clone)]
-enum HttpRangeParseError {
-    InvalidRange,
-    NoOverlap,
-}
-
-impl From<http_range::HttpRangeParseError> for HttpRangeParseError {
-    fn from(err: http_range::HttpRangeParseError) -> Self {
-        match err {
-            http_range::HttpRangeParseError::InvalidRange => Self::InvalidRange,
-            http_range::HttpRangeParseError::NoOverlap => Self::NoOverlap,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Error)]
-#[non_exhaustive]
-pub struct ParseRangeErr(#[error(not(source))] HttpRangeParseError);
-
-impl fmt::Display for ParseRangeErr {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str("invalid Range header: ")?;
-        f.write_str(match self.0 {
-            HttpRangeParseError::InvalidRange => "invalid syntax",
-            HttpRangeParseError::NoOverlap => "range starts after end of content",
-        })
-    }
-}
+use derive_more::{Display, Error};
 
 /// HTTP Range header representation.
 #[derive(Debug, Clone, Copy)]
@@ -42,22 +10,26 @@ pub struct HttpRange {
     pub length: u64,
 }
 
+#[derive(Debug, Clone, Display, Error)]
+#[display(fmt = "Parse HTTP Range failed")]
+pub struct ParseRangeErr(#[error(not(source))] ());
+
 impl HttpRange {
     /// Parses Range HTTP header string as per RFC 2616.
     ///
     /// `header` is HTTP Range header (e.g. `bytes=bytes=0-9`).
     /// `size` is full size of response (file).
     pub fn parse(header: &str, size: u64) -> Result<Vec<HttpRange>, ParseRangeErr> {
-        let ranges = http_range::HttpRange::parse(header, size)
-            .map_err(|err| ParseRangeErr(err.into()))?;
-
-        Ok(ranges
-            .iter()
-            .map(|range| HttpRange {
-                start: range.start,
-                length: range.length,
-            })
-            .collect())
+        match http_range::HttpRange::parse(header, size) {
+            Ok(ranges) => Ok(ranges
+                .iter()
+                .map(|range| HttpRange {
+                    start: range.start,
+                    length: range.length,
+                })
+                .collect()),
+            Err(_) => Err(ParseRangeErr(())),
+        }
     }
 }
 

actix-files/src/service.rs

@@ -23,7 +23,7 @@ impl Deref for FilesService {
     type Target = FilesServiceInner;
 
     fn deref(&self) -> &Self::Target {
-        &self.0
+        &*self.0
     }
 }
 

actix-files/tests/encoding.rs

@@ -1,11 +1,11 @@
-use actix_files::{Files, NamedFile};
+use actix_files::Files;
 use actix_web::{
     http::{
         header::{self, HeaderValue},
         StatusCode,
     },
     test::{self, TestRequest},
-    web, App,
+    App,
 };
 
 #[actix_web::test]
@@ -36,31 +36,3 @@ async fn test_utf8_file_contents() {
         Some(&HeaderValue::from_static("text/plain")),
     );
 }
-
-#[actix_web::test]
-async fn partial_range_response_encoding() {
-    let srv = test::init_service(App::new().default_service(web::to(|| async {
-        NamedFile::open_async("./tests/test.binary").await.unwrap()
-    })))
-    .await;
-
-    // range request without accept-encoding returns no content-encoding header
-    let req = TestRequest::with_uri("/")
-        .append_header((header::RANGE, "bytes=10-20"))
-        .to_request();
-    let res = test::call_service(&srv, req).await;
-    assert_eq!(res.status(), StatusCode::PARTIAL_CONTENT);
-    assert!(!res.headers().contains_key(header::CONTENT_ENCODING));
-
-    // range request with accept-encoding returns a content-encoding header
-    let req = TestRequest::with_uri("/")
-        .append_header((header::RANGE, "bytes=10-20"))
-        .append_header((header::ACCEPT_ENCODING, "identity"))
-        .to_request();
-    let res = test::call_service(&srv, req).await;
-    assert_eq!(res.status(), StatusCode::PARTIAL_CONTENT);
-    assert_eq!(
-        res.headers().get(header::CONTENT_ENCODING).unwrap(),
-        "identity"
-    );
-}

actix-http-test/CHANGES.md

@@ -1,97 +1,76 @@
 # Changes
 
-## Unreleased - 2023-xx-xx
+## Unreleased - 2022-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency.
 
-## 3.1.0 - 2023-01-21
-
-- Minimum supported Rust version (MSRV) is now 1.59.
-
-## 3.0.0 - 2022-07-24
-
-- `TestServer::stop` is now async and will wait for the server and system to shutdown. [#2442]
-- Added `TestServer::client_headers` method. [#2097]
-- Update `actix-server` dependency to `2`.
-- Update `actix-tls` dependency to `3`.
-- Update `bytes` to `1.0`. [#1813]
-- Minimum supported Rust version (MSRV) is now 1.57.
-
-[#2442]: https://github.com/actix/actix-web/pull/2442
-[#2097]: https://github.com/actix/actix-web/pull/2097
-[#1813]: https://github.com/actix/actix-web/pull/1813
-
-<details>
-<summary>3.0.0 Pre-Releases</summary>
 
 ## 3.0.0-beta.13 - 2022-02-16
-
 - No significant changes since `3.0.0-beta.12`.
 
-## 3.0.0-beta.12 - 2022-01-31
 
+## 3.0.0-beta.12 - 2022-01-31
 - No significant changes since `3.0.0-beta.11`.
 
-## 3.0.0-beta.11 - 2022-01-04
 
+## 3.0.0-beta.11 - 2022-01-04
 - Minimum supported Rust version (MSRV) is now 1.54.
 
-## 3.0.0-beta.10 - 2021-12-27
 
+## 3.0.0-beta.10 - 2021-12-27
 - Update `actix-server` to `2.0.0-rc.2`. [#2550]
 
 [#2550]: https://github.com/actix/actix-web/pull/2550
 
-## 3.0.0-beta.9 - 2021-12-11
 
+## 3.0.0-beta.9 - 2021-12-11
 - No significant changes since `3.0.0-beta.8`.
 
-## 3.0.0-beta.8 - 2021-11-30
 
+## 3.0.0-beta.8 - 2021-11-30
 - Update `actix-tls` to `3.0.0-rc.1`. [#2474]
 
 [#2474]: https://github.com/actix/actix-web/pull/2474
 
-## 3.0.0-beta.7 - 2021-11-22
 
+## 3.0.0-beta.7 - 2021-11-22
 - Fix compatibility with experimental `io-uring` feature of `actix-rt`. [#2408]
 
 [#2408]: https://github.com/actix/actix-web/pull/2408
 
-## 3.0.0-beta.6 - 2021-11-15
 
+## 3.0.0-beta.6 - 2021-11-15
 - `TestServer::stop` is now async and will wait for the server and system to shutdown. [#2442]
 - Update `actix-server` to `2.0.0-beta.9`. [#2442]
 - Minimum supported Rust version (MSRV) is now 1.52.
 
 [#2442]: https://github.com/actix/actix-web/pull/2442
 
-## 3.0.0-beta.5 - 2021-09-09
 
+## 3.0.0-beta.5 - 2021-09-09
 - Minimum supported Rust version (MSRV) is now 1.51.
 
-## 3.0.0-beta.4 - 2021-04-02
 
+## 3.0.0-beta.4 - 2021-04-02
 - Added `TestServer::client_headers` method. [#2097]
 
 [#2097]: https://github.com/actix/actix-web/pull/2097
 
-## 3.0.0-beta.3 - 2021-03-09
 
+## 3.0.0-beta.3 - 2021-03-09
 - No notable changes.
 
+
 ## 3.0.0-beta.2 - 2021-02-10
-
 - No notable changes.
 
-## 3.0.0-beta.1 - 2021-01-07
 
+## 3.0.0-beta.1 - 2021-01-07
 - Update `bytes` to `1.0`. [#1813]
 
 [#1813]: https://github.com/actix/actix-web/pull/1813
 
-</details>
 
 ## 2.1.0 - 2020-11-25
-
 - Add ability to set address for `TestServer`. [#1645]
 - Upgrade `base64` to `0.13`.
 - Upgrade `serde_urlencoded` to `0.7`. [#1773]
@@ -99,12 +78,12 @@
 [#1773]: https://github.com/actix/actix-web/pull/1773
 [#1645]: https://github.com/actix/actix-web/pull/1645
 
-## 2.0.0 - 2020-09-11
 
+## 2.0.0 - 2020-09-11
 - Update actix-codec and actix-utils dependencies.
 
-## 2.0.0-alpha.1 - 2020-05-23
 
+## 2.0.0-alpha.1 - 2020-05-23
 - Update the `time` dependency to 0.2.7
 - Update `actix-connect` dependency to 2.0.0-alpha.2
 - Make `test_server` `async` fn.
@@ -114,56 +93,55 @@
 - Update `env_logger` dependency to 0.7
 
 ## 1.0.0 - 2019-12-13
-
 - Replaced `TestServer::start()` with `test_server()`
 
-## 1.0.0-alpha.3 - 2019-12-07
 
+## 1.0.0-alpha.3 - 2019-12-07
 - Migrate to `std::future`
 
-## 0.2.5 - 2019-09-17
 
+## 0.2.5 - 2019-09-17
 - Update serde_urlencoded to "0.6.1"
 - Increase TestServerRuntime timeouts from 500ms to 3000ms
 - Do not override current `System`
 
-## 0.2.4 - 2019-07-18
 
+## 0.2.4 - 2019-07-18
 - Update actix-server to 0.6
 
-## 0.2.3 - 2019-07-16
 
+## 0.2.3 - 2019-07-16
 - Add `delete`, `options`, `patch` methods to `TestServerRunner`
 
-## 0.2.2 - 2019-06-16
 
+## 0.2.2 - 2019-06-16
 - Add .put() and .sput() methods
 
-## 0.2.1 - 2019-06-05
 
+## 0.2.1 - 2019-06-05
 - Add license files
 
-## 0.2.0 - 2019-05-12
 
+## 0.2.0 - 2019-05-12
 - Update awc and actix-http deps
 
-## 0.1.1 - 2019-04-24
 
+## 0.1.1 - 2019-04-24
 - Always make new connection for http client
 
-## 0.1.0 - 2019-04-16
 
+## 0.1.0 - 2019-04-16
 - No changes
 
-## 0.1.0-alpha.3 - 2019-04-02
 
+## 0.1.0-alpha.3 - 2019-04-02
 - Request functions accept path #743
 
-## 0.1.0-alpha.2 - 2019-03-29
 
+## 0.1.0-alpha.2 - 2019-03-29
 - Added TestServerRuntime::load_body() method
 - Update actix-http and awc libraries
 
-## 0.1.0-alpha.1 - 2019-03-28
 
+## 0.1.0-alpha.1 - 2019-03-28
 - Initial impl

actix-http-test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http-test"
-version = "3.1.0"
+version = "3.0.0-beta.13"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Various helpers for Actix applications to use during testing"
 keywords = ["http", "web", "framework", "async", "futures"]
@@ -37,17 +37,18 @@ actix-rt = "2.2"
 actix-server = "2"
 awc = { version = "3", default-features = false }
 
+base64 = "0.13"
 bytes = "1"
-futures-core = { version = "0.3.17", default-features = false }
-http = "0.2.7"
+futures-core = { version = "0.3.7", default-features = false }
+http = "0.2.5"
 log = "0.4"
 socket2 = "0.4"
-serde = "1"
-serde_json = "1"
+serde = "1.0"
+serde_json = "1.0"
 slab = "0.4"
 serde_urlencoded = "0.7"
 tls-openssl = { version = "0.10.9", package = "openssl", optional = true }
-tokio = { version = "1.24.2", features = ["sync"] }
+tokio = { version = "1.8.4", features = ["sync"] }
 
 [dev-dependencies]
 actix-web = { version = "4", default-features = false, features = ["cookies"] }

actix-http-test/README.md

@@ -3,15 +3,15 @@
 > Various helpers for Actix applications to use during testing.
 
 [![crates.io](https://img.shields.io/crates/v/actix-http-test?label=latest)](https://crates.io/crates/actix-http-test)
-[![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.1.0)](https://docs.rs/actix-http-test/3.1.0)
-![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
+[![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.0.0-beta.13)](https://docs.rs/actix-http-test/3.0.0-beta.13)
+![Version](https://img.shields.io/badge/rustc-1.57+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http-test)
 <br>
-[![Dependency Status](https://deps.rs/crate/actix-http-test/3.1.0/status.svg)](https://deps.rs/crate/actix-http-test/3.1.0)
+[![Dependency Status](https://deps.rs/crate/actix-http-test/3.0.0-beta.13/status.svg)](https://deps.rs/crate/actix-http-test/3.0.0-beta.13)
 [![Download](https://img.shields.io/crates/d/actix-http-test.svg)](https://crates.io/crates/actix-http-test)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/actix-http-test)
-- Minimum Supported Rust Version (MSRV): 1.59
+- Minimum Supported Rust Version (MSRV): 1.54

actix-http-test/src/lib.rs

@@ -2,10 +2,8 @@
 
 #![deny(rust_2018_idioms, nonstandard_style)]
 #![warn(future_incompatible)]
-#![allow(clippy::uninlined_format_args)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
 #[cfg(feature = "openssl")]
 extern crate tls_openssl as openssl;
@@ -34,9 +32,7 @@ use tokio::sync::mpsc;
 /// ```no_run
 /// use actix_http::HttpService;
 /// use actix_http_test::test_server;
-/// use actix_service::map_config;
-/// use actix_service::ServiceFactoryExt;
-/// use actix_web::{dev::AppConfig, web, App, Error, HttpResponse};
+/// use actix_web::{web, App, HttpResponse, Error};
 ///
 /// async fn my_handler() -> Result<HttpResponse, Error> {
 ///     Ok(HttpResponse::Ok().into())
@@ -44,19 +40,14 @@ use tokio::sync::mpsc;
 ///
 /// #[actix_web::test]
 /// async fn test_example() {
-///     let srv = test_server(|| {
-///         let app = App::new().service(web::resource("/").to(my_handler));
-///
-///         HttpService::build()
-///             .h1(map_config(app, |_| AppConfig::default()))
-///             .tcp()
-///             .map_err(|_| ())
-///     })
-///     .await;
+///     let mut srv = TestServer::start(||
+///         HttpService::new(
+///             App::new().service(web::resource("/").to(my_handler))
+///         )
+///     );
 ///
 ///     let req = srv.get("/");
 ///     let response = req.send().await.unwrap();
-///
 ///     assert!(response.status().is_success());
 /// }
 /// ```
@@ -96,7 +87,6 @@ pub async fn test_server_with_addr<F: ServerServiceFactory<TcpStream>>(
 
         // notify TestServer that server and system have shut down
         // all thread managed resources should be dropped at this point
-        #[allow(clippy::let_underscore_future)]
         let _ = thread_stop_tx.send(());
     });
 
@@ -304,7 +294,6 @@ impl Drop for TestServer {
         // without needing to await anything
 
         // signal server to stop
-        #[allow(clippy::let_underscore_future)]
         let _ = self.server.stop(true);
 
         // signal system to stop

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "3.3.1"
+version = "3.2.1"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Rob Ede <robjtede@icloud.com>",
@@ -61,24 +61,22 @@ actix-codec = "0.5"
 actix-utils = "3"
 actix-rt = { version = "2.2", default-features = false }
 
-ahash = "0.8"
+ahash = "0.7"
 bitflags = "1.2"
 bytes = "1"
 bytestring = "1"
 derive_more = "0.99.5"
 encoding_rs = "0.8"
-futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
-http = "0.2.7"
+futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
+http = "0.2.5"
 httparse = "1.5.1"
 httpdate = "1.0.1"
 itoa = "1"
 language-tags = "0.3"
-mime = "0.3.4"
+mime = "0.3"
 percent-encoding = "2.1"
 pin-project-lite = "0.2"
 smallvec = "1.6.1"
-tokio = { version = "1.24.2", features = [] }
-tokio-util = { version = "0.7", features = ["io", "codec"] }
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 # http2
@@ -86,7 +84,7 @@ h2 = { version = "0.3.9", optional = true }
 
 # websockets
 local-channel = { version = "0.1", optional = true }
-base64 = { version = "0.21", optional = true }
+base64 = { version = "0.13", optional = true }
 rand = { version = "0.8", optional = true }
 sha1 = { version = "0.10", optional = true }
 
@@ -96,18 +94,18 @@ actix-tls = { version = "3", default-features = false, optional = true }
 # compress-*
 brotli = { version = "3.3.3", optional = true }
 flate2 = { version = "1.0.13", optional = true }
-zstd = { version = "0.12", optional = true }
+zstd = { version = "0.11", optional = true }
 
 [dev-dependencies]
-actix-http-test = { version = "3", features = ["openssl"] }
+actix-http-test = { version = "3.0.0-beta.13", features = ["openssl"] }
 actix-server = "2"
 actix-tls = { version = "3", features = ["openssl"] }
 actix-web = "4"
 
 async-stream = "0.3"
-criterion = { version = "0.4", features = ["html_reports"] }
+criterion = { version = "0.3", features = ["html_reports"] }
 env_logger = "0.9"
-futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
+futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
 memchr = "2.4"
 once_cell = "1.9"
 rcgen = "0.9"
@@ -119,13 +117,24 @@ serde_json = "1.0"
 static_assertions = "1"
 tls-openssl = { package = "openssl", version = "0.10.9" }
 tls-rustls = { package = "rustls", version = "0.20.0" }
-tokio = { version = "1.24.2", features = ["net", "rt", "macros"] }
+tokio = { version = "1.8.4", features = ["net", "rt", "macros"] }
 
 [[example]]
 name = "ws"
 required-features = ["ws", "rustls"]
 
 [[bench]]
-name = "response-body-compression"
+name = "write-camel-case"
+harness = false
+
+[[bench]]
+name = "status-line"
+harness = false
+
+[[bench]]
+name = "uninit-headers"
+harness = false
+
+[[bench]]
+name = "quality-value"
 harness = false
-required-features = ["compress-brotli", "compress-gzip", "compress-zstd"]

actix-http/README.md

@@ -3,18 +3,18 @@
 > HTTP primitives for the Actix ecosystem.
 
 [![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.3.1)](https://docs.rs/actix-http/3.3.1)
-![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.2.1)](https://docs.rs/actix-http/3.2.1)
+![Version](https://img.shields.io/badge/rustc-1.57+-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.3.1/status.svg)](https://deps.rs/crate/actix-http/3.3.1)
+[![dependency status](https://deps.rs/crate/actix-http/3.2.1/status.svg)](https://deps.rs/crate/actix-http/3.2.1)
 [![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)
 
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/actix-http)
-- Minimum Supported Rust Version (MSRV): 1.59
+- Minimum Supported Rust Version (MSRV): 1.54
 
 ## Example
 
@@ -49,3 +49,18 @@ async fn main() -> io::Result<()> {
         .await
 }
 ```
+
+## License
+
+This project is licensed under either of
+
+- Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0))
+- MIT license ([LICENSE-MIT](LICENSE-MIT) or [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT))
+
+at your option.
+
+## Code of Conduct
+
+Contribution to the actix-http crate is organized under the terms of the
+Contributor Covenant, the maintainer of actix-http, @fafhrd91, promises to
+intervene to uphold that code of conduct.

actix-http/benches/quality-value.rs

@@ -0,0 +1,95 @@
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+
+const CODES: &[u16] = &[0, 1000, 201, 800, 550];
+
+fn bench_quality_display_impls(c: &mut Criterion) {
+    let mut group = c.benchmark_group("quality value display impls");
+
+    for i in CODES.iter() {
+        group.bench_with_input(BenchmarkId::new("New (fast?)", i), i, |b, &i| {
+            b.iter(|| _new::Quality(i).to_string())
+        });
+
+        group.bench_with_input(BenchmarkId::new("Naive", i), i, |b, &i| {
+            b.iter(|| _naive::Quality(i).to_string())
+        });
+    }
+
+    group.finish();
+}
+
+criterion_group!(benches, bench_quality_display_impls);
+criterion_main!(benches);
+
+mod _new {
+    use std::fmt;
+
+    pub struct Quality(pub(crate) u16);
+
+    impl fmt::Display for Quality {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            match self.0 {
+                0 => f.write_str("0"),
+                1000 => f.write_str("1"),
+
+                // some number in the range 1–999
+                x => {
+                    f.write_str("0.")?;
+
+                    // this implementation avoids string allocation otherwise required
+                    // for `.trim_end_matches('0')`
+
+                    if x < 10 {
+                        f.write_str("00")?;
+                        // 0 is handled so it's not possible to have a trailing 0, we can just return
+                        itoa_fmt(f, x)
+                    } else if x < 100 {
+                        f.write_str("0")?;
+                        if x % 10 == 0 {
+                            // trailing 0, divide by 10 and write
+                            itoa_fmt(f, x / 10)
+                        } else {
+                            itoa_fmt(f, x)
+                        }
+                    } else {
+                        // x is in range 101–999
+
+                        if x % 100 == 0 {
+                            // two trailing 0s, divide by 100 and write
+                            itoa_fmt(f, x / 100)
+                        } else if x % 10 == 0 {
+                            // one trailing 0, divide by 10 and write
+                            itoa_fmt(f, x / 10)
+                        } else {
+                            itoa_fmt(f, x)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    pub fn itoa_fmt<W: fmt::Write, V: itoa::Integer>(mut wr: W, value: V) -> fmt::Result {
+        let mut buf = itoa::Buffer::new();
+        wr.write_str(buf.format(value))
+    }
+}
+
+mod _naive {
+    use std::fmt;
+
+    pub struct Quality(pub(crate) u16);
+
+    impl fmt::Display for Quality {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            match self.0 {
+                0 => f.write_str("0"),
+                1000 => f.write_str("1"),
+
+                x => {
+                    write!(f, "{}", format!("{:03}", x).trim_end_matches('0'))
+                }
+            }
+        }
+    }
+}

actix-http/benches/response-body-compression.rs

@@ -1,90 +0,0 @@
-#![allow(clippy::uninlined_format_args)]
-
-use std::convert::Infallible;
-
-use actix_http::{encoding::Encoder, ContentEncoding, Request, Response, StatusCode};
-use actix_service::{fn_service, Service as _};
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-
-static BODY: &[u8] = include_bytes!("../Cargo.toml");
-
-fn compression_responses(c: &mut Criterion) {
-    let mut group = c.benchmark_group("compression responses");
-
-    group.bench_function("identity", |b| {
-        let rt = actix_rt::Runtime::new().unwrap();
-
-        let identity_svc = fn_service(|_: Request| async move {
-            let mut res = Response::with_body(StatusCode::OK, ());
-            let body = black_box(Encoder::response(
-                ContentEncoding::Identity,
-                res.head_mut(),
-                BODY,
-            ));
-            Ok::<_, Infallible>(black_box(res.set_body(black_box(body))))
-        });
-
-        b.iter(|| {
-            rt.block_on(identity_svc.call(Request::new())).unwrap();
-        });
-    });
-
-    group.bench_function("gzip", |b| {
-        let rt = actix_rt::Runtime::new().unwrap();
-
-        let identity_svc = fn_service(|_: Request| async move {
-            let mut res = Response::with_body(StatusCode::OK, ());
-            let body = black_box(Encoder::response(
-                ContentEncoding::Gzip,
-                res.head_mut(),
-                BODY,
-            ));
-            Ok::<_, Infallible>(black_box(res.set_body(black_box(body))))
-        });
-
-        b.iter(|| {
-            rt.block_on(identity_svc.call(Request::new())).unwrap();
-        });
-    });
-
-    group.bench_function("br", |b| {
-        let rt = actix_rt::Runtime::new().unwrap();
-
-        let identity_svc = fn_service(|_: Request| async move {
-            let mut res = Response::with_body(StatusCode::OK, ());
-            let body = black_box(Encoder::response(
-                ContentEncoding::Brotli,
-                res.head_mut(),
-                BODY,
-            ));
-            Ok::<_, Infallible>(black_box(res.set_body(black_box(body))))
-        });
-
-        b.iter(|| {
-            rt.block_on(identity_svc.call(Request::new())).unwrap();
-        });
-    });
-
-    group.bench_function("zstd", |b| {
-        let rt = actix_rt::Runtime::new().unwrap();
-
-        let identity_svc = fn_service(|_: Request| async move {
-            let mut res = Response::with_body(StatusCode::OK, ());
-            let body = black_box(Encoder::response(
-                ContentEncoding::Zstd,
-                res.head_mut(),
-                BODY,
-            ));
-            Ok::<_, Infallible>(black_box(res.set_body(black_box(body))))
-        });
-
-        b.iter(|| {
-            rt.block_on(identity_svc.call(Request::new())).unwrap();
-        });
-    });
-
-    group.finish();
-}
-
-criterion_group!(benches, compression_responses);
-criterion_main!(benches);

actix-http/benches/status-line.rs

@@ -0,0 +1,214 @@
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+
+use bytes::BytesMut;
+use http::Version;
+
+const CODES: &[u16] = &[201, 303, 404, 515];
+
+fn bench_write_status_line_11(c: &mut Criterion) {
+    let mut group = c.benchmark_group("write_status_line v1.1");
+
+    let version = Version::HTTP_11;
+
+    for i in CODES.iter() {
+        group.bench_with_input(BenchmarkId::new("Original (unsafe)", i), i, |b, &i| {
+            b.iter(|| {
+                let mut b = BytesMut::with_capacity(35);
+                _original::write_status_line(version, i, &mut b);
+            })
+        });
+
+        group.bench_with_input(BenchmarkId::new("New (safe)", i), i, |b, &i| {
+            b.iter(|| {
+                let mut b = BytesMut::with_capacity(35);
+                _new::write_status_line(version, i, &mut b);
+            })
+        });
+
+        group.bench_with_input(BenchmarkId::new("Naive", i), i, |b, &i| {
+            b.iter(|| {
+                let mut b = BytesMut::with_capacity(35);
+                _naive::write_status_line(version, i, &mut b);
+            })
+        });
+    }
+
+    group.finish();
+}
+
+fn bench_write_status_line_10(c: &mut Criterion) {
+    let mut group = c.benchmark_group("write_status_line v1.0");
+
+    let version = Version::HTTP_10;
+
+    for i in CODES.iter() {
+        group.bench_with_input(BenchmarkId::new("Original (unsafe)", i), i, |b, &i| {
+            b.iter(|| {
+                let mut b = BytesMut::with_capacity(35);
+                _original::write_status_line(version, i, &mut b);
+            })
+        });
+
+        group.bench_with_input(BenchmarkId::new("New (safe)", i), i, |b, &i| {
+            b.iter(|| {
+                let mut b = BytesMut::with_capacity(35);
+                _new::write_status_line(version, i, &mut b);
+            })
+        });
+
+        group.bench_with_input(BenchmarkId::new("Naive", i), i, |b, &i| {
+            b.iter(|| {
+                let mut b = BytesMut::with_capacity(35);
+                _naive::write_status_line(version, i, &mut b);
+            })
+        });
+    }
+
+    group.finish();
+}
+
+fn bench_write_status_line_09(c: &mut Criterion) {
+    let mut group = c.benchmark_group("write_status_line v0.9");
+
+    let version = Version::HTTP_09;
+
+    for i in CODES.iter() {
+        group.bench_with_input(BenchmarkId::new("Original (unsafe)", i), i, |b, &i| {
+            b.iter(|| {
+                let mut b = BytesMut::with_capacity(35);
+                _original::write_status_line(version, i, &mut b);
+            })
+        });
+
+        group.bench_with_input(BenchmarkId::new("New (safe)", i), i, |b, &i| {
+            b.iter(|| {
+                let mut b = BytesMut::with_capacity(35);
+                _new::write_status_line(version, i, &mut b);
+            })
+        });
+
+        group.bench_with_input(BenchmarkId::new("Naive", i), i, |b, &i| {
+            b.iter(|| {
+                let mut b = BytesMut::with_capacity(35);
+                _naive::write_status_line(version, i, &mut b);
+            })
+        });
+    }
+
+    group.finish();
+}
+
+criterion_group!(
+    benches,
+    bench_write_status_line_11,
+    bench_write_status_line_10,
+    bench_write_status_line_09
+);
+criterion_main!(benches);
+
+mod _naive {
+    use bytes::{BufMut, BytesMut};
+    use http::Version;
+
+    pub(crate) fn write_status_line(version: Version, n: u16, bytes: &mut BytesMut) {
+        match version {
+            Version::HTTP_11 => bytes.put_slice(b"HTTP/1.1 "),
+            Version::HTTP_10 => bytes.put_slice(b"HTTP/1.0 "),
+            Version::HTTP_09 => bytes.put_slice(b"HTTP/0.9 "),
+            _ => {
+                // other HTTP version handlers do not use this method
+            }
+        }
+
+        bytes.put_slice(n.to_string().as_bytes());
+    }
+}
+
+mod _new {
+    use bytes::{BufMut, BytesMut};
+    use http::Version;
+
+    const DIGITS_START: u8 = b'0';
+
+    pub(crate) fn write_status_line(version: Version, n: u16, bytes: &mut BytesMut) {
+        match version {
+            Version::HTTP_11 => bytes.put_slice(b"HTTP/1.1 "),
+            Version::HTTP_10 => bytes.put_slice(b"HTTP/1.0 "),
+            Version::HTTP_09 => bytes.put_slice(b"HTTP/0.9 "),
+            _ => {
+                // other HTTP version handlers do not use this method
+            }
+        }
+
+        let d100 = (n / 100) as u8;
+        let d10 = ((n / 10) % 10) as u8;
+        let d1 = (n % 10) as u8;
+
+        bytes.put_u8(DIGITS_START + d100);
+        bytes.put_u8(DIGITS_START + d10);
+        bytes.put_u8(DIGITS_START + d1);
+
+        bytes.put_u8(b' ');
+    }
+}
+
+mod _original {
+    use std::ptr;
+
+    use bytes::{BufMut, BytesMut};
+    use http::Version;
+
+    const DEC_DIGITS_LUT: &[u8] = b"0001020304050607080910111213141516171819\
+        2021222324252627282930313233343536373839\
+        4041424344454647484950515253545556575859\
+        6061626364656667686970717273747576777879\
+        8081828384858687888990919293949596979899";
+
+    pub(crate) const STATUS_LINE_BUF_SIZE: usize = 13;
+
+    pub(crate) fn write_status_line(version: Version, mut n: u16, bytes: &mut BytesMut) {
+        let mut buf: [u8; STATUS_LINE_BUF_SIZE] = *b"HTTP/1.1     ";
+
+        match version {
+            Version::HTTP_2 => buf[5] = b'2',
+            Version::HTTP_10 => buf[7] = b'0',
+            Version::HTTP_09 => {
+                buf[5] = b'0';
+                buf[7] = b'9';
+            }
+            _ => {}
+        }
+
+        let mut curr: isize = 12;
+        let buf_ptr = buf.as_mut_ptr();
+        let lut_ptr = DEC_DIGITS_LUT.as_ptr();
+        let four = n > 999;
+
+        // decode 2 more chars, if > 2 chars
+        let d1 = (n % 100) << 1;
+        n /= 100;
+        curr -= 2;
+        unsafe {
+            ptr::copy_nonoverlapping(lut_ptr.offset(d1 as isize), buf_ptr.offset(curr), 2);
+        }
+
+        // decode last 1 or 2 chars
+        if n < 10 {
+            curr -= 1;
+            unsafe {
+                *buf_ptr.offset(curr) = (n as u8) + b'0';
+            }
+        } else {
+            let d1 = n << 1;
+            curr -= 2;
+            unsafe {
+                ptr::copy_nonoverlapping(lut_ptr.offset(d1 as isize), buf_ptr.offset(curr), 2);
+            }
+        }
+
+        bytes.put_slice(&buf);
+        if four {
+            bytes.put_u8(b' ');
+        }
+    }
+}

actix-http/benches/uninit-headers.rs

@@ -0,0 +1,135 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+
+use bytes::BytesMut;
+
+// A Miri run detects UB, seen on this playground:
+// https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=f5d9aa166aa48df8dca05fce2b6c3915
+
+fn bench_header_parsing(c: &mut Criterion) {
+    c.bench_function("Original (Unsound) [short]", |b| {
+        b.iter(|| {
+            let mut buf = BytesMut::from(REQ_SHORT);
+            _original::parse_headers(&mut buf);
+        })
+    });
+
+    c.bench_function("New (safe) [short]", |b| {
+        b.iter(|| {
+            let mut buf = BytesMut::from(REQ_SHORT);
+            _new::parse_headers(&mut buf);
+        })
+    });
+
+    c.bench_function("Original (Unsound) [realistic]", |b| {
+        b.iter(|| {
+            let mut buf = BytesMut::from(REQ);
+            _original::parse_headers(&mut buf);
+        })
+    });
+
+    c.bench_function("New (safe) [realistic]", |b| {
+        b.iter(|| {
+            let mut buf = BytesMut::from(REQ);
+            _new::parse_headers(&mut buf);
+        })
+    });
+}
+
+criterion_group!(benches, bench_header_parsing);
+criterion_main!(benches);
+
+const MAX_HEADERS: usize = 96;
+
+const EMPTY_HEADER_ARRAY: [httparse::Header<'static>; MAX_HEADERS] =
+    [httparse::EMPTY_HEADER; MAX_HEADERS];
+
+#[derive(Clone, Copy)]
+struct HeaderIndex {
+    name: (usize, usize),
+    value: (usize, usize),
+}
+
+const EMPTY_HEADER_INDEX: HeaderIndex = HeaderIndex {
+    name: (0, 0),
+    value: (0, 0),
+};
+
+const EMPTY_HEADER_INDEX_ARRAY: [HeaderIndex; MAX_HEADERS] = [EMPTY_HEADER_INDEX; MAX_HEADERS];
+
+impl HeaderIndex {
+    fn record(bytes: &[u8], headers: &[httparse::Header<'_>], indices: &mut [HeaderIndex]) {
+        let bytes_ptr = bytes.as_ptr() as usize;
+        for (header, indices) in headers.iter().zip(indices.iter_mut()) {
+            let name_start = header.name.as_ptr() as usize - bytes_ptr;
+            let name_end = name_start + header.name.len();
+            indices.name = (name_start, name_end);
+            let value_start = header.value.as_ptr() as usize - bytes_ptr;
+            let value_end = value_start + header.value.len();
+            indices.value = (value_start, value_end);
+        }
+    }
+}
+
+// test cases taken from:
+// https://github.com/seanmonstar/httparse/blob/master/benches/parse.rs
+
+const REQ_SHORT: &[u8] = b"\
+GET / HTTP/1.0\r\n\
+Host: example.com\r\n\
+Cookie: session=60; user_id=1\r\n\r\n";
+
+const REQ: &[u8] = b"\
+GET /wp-content/uploads/2010/03/hello-kitty-darth-vader-pink.jpg HTTP/1.1\r\n\
+Host: www.kittyhell.com\r\n\
+User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; ja-JP-mac; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 Pathtraq/0.9\r\n\
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n\
+Accept-Language: ja,en-us;q=0.7,en;q=0.3\r\n\
+Accept-Encoding: gzip,deflate\r\n\
+Accept-Charset: Shift_JIS,utf-8;q=0.7,*;q=0.7\r\n\
+Keep-Alive: 115\r\n\
+Connection: keep-alive\r\n\
+Cookie: wp_ozh_wsa_visits=2; wp_ozh_wsa_visit_lasttime=xxxxxxxxxx; __utma=xxxxxxxxx.xxxxxxxxxx.xxxxxxxxxx.xxxxxxxxxx.xxxxxxxxxx.x; __utmz=xxxxxxxxx.xxxxxxxxxx.x.x.utmccn=(referral)|utmcsr=reader.livedoor.com|utmcct=/reader/|utmcmd=referral|padding=under256\r\n\r\n";
+
+mod _new {
+    use super::*;
+
+    pub fn parse_headers(src: &mut BytesMut) -> usize {
+        let mut headers: [HeaderIndex; MAX_HEADERS] = EMPTY_HEADER_INDEX_ARRAY;
+        let mut parsed: [httparse::Header<'_>; MAX_HEADERS] = EMPTY_HEADER_ARRAY;
+
+        let mut req = httparse::Request::new(&mut parsed);
+        match req.parse(src).unwrap() {
+            httparse::Status::Complete(_len) => {
+                HeaderIndex::record(src, req.headers, &mut headers);
+                req.headers.len()
+            }
+            _ => unreachable!(),
+        }
+    }
+}
+
+mod _original {
+    use super::*;
+
+    use std::mem::MaybeUninit;
+
+    pub fn parse_headers(src: &mut BytesMut) -> usize {
+        #![allow(invalid_value, clippy::uninit_assumed_init)]
+
+        let mut headers: [HeaderIndex; MAX_HEADERS] =
+            unsafe { MaybeUninit::uninit().assume_init() };
+
+        #[allow(invalid_value)]
+        let mut parsed: [httparse::Header<'_>; MAX_HEADERS] =
+            unsafe { MaybeUninit::uninit().assume_init() };
+
+        let mut req = httparse::Request::new(&mut parsed);
+        match req.parse(src).unwrap() {
+            httparse::Status::Complete(_len) => {
+                HeaderIndex::record(src, req.headers, &mut headers);
+                req.headers.len()
+            }
+            _ => unreachable!(),
+        }
+    }
+}

actix-http/benches/write-camel-case.rs

@@ -0,0 +1,93 @@
+use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
+
+fn bench_write_camel_case(c: &mut Criterion) {
+    let mut group = c.benchmark_group("write_camel_case");
+
+    let names = ["connection", "Transfer-Encoding", "transfer-encoding"];
+
+    for &i in &names {
+        let bts = i.as_bytes();
+
+        group.bench_with_input(BenchmarkId::new("Original", i), bts, |b, bts| {
+            b.iter(|| {
+                let mut buf = black_box([0; 24]);
+                _original::write_camel_case(black_box(bts), &mut buf)
+            });
+        });
+
+        group.bench_with_input(BenchmarkId::new("New", i), bts, |b, bts| {
+            b.iter(|| {
+                let mut buf = black_box([0; 24]);
+                let len = black_box(bts.len());
+                _new::write_camel_case(black_box(bts), buf.as_mut_ptr(), len)
+            });
+        });
+    }
+
+    group.finish();
+}
+
+criterion_group!(benches, bench_write_camel_case);
+criterion_main!(benches);
+
+mod _new {
+    pub fn write_camel_case(value: &[u8], buf: *mut u8, len: usize) {
+        // first copy entire (potentially wrong) slice to output
+        let buffer = unsafe {
+            std::ptr::copy_nonoverlapping(value.as_ptr(), buf, len);
+            std::slice::from_raw_parts_mut(buf, len)
+        };
+
+        let mut iter = value.iter();
+
+        // first character should be uppercase
+        if let Some(c @ b'a'..=b'z') = iter.next() {
+            buffer[0] = c & 0b1101_1111;
+        }
+
+        // track 1 ahead of the current position since that's the location being assigned to
+        let mut index = 2;
+
+        // remaining characters after hyphens should also be uppercase
+        while let Some(&c) = iter.next() {
+            if c == b'-' {
+                // advance iter by one and uppercase if needed
+                if let Some(c @ b'a'..=b'z') = iter.next() {
+                    buffer[index] = c & 0b1101_1111;
+                }
+            }
+
+            index += 1;
+        }
+    }
+}
+
+mod _original {
+    pub fn write_camel_case(value: &[u8], buffer: &mut [u8]) {
+        let mut index = 0;
+        let key = value;
+        let mut key_iter = key.iter();
+
+        if let Some(c) = key_iter.next() {
+            if *c >= b'a' && *c <= b'z' {
+                buffer[index] = *c ^ b' ';
+                index += 1;
+            }
+        } else {
+            return;
+        }
+
+        while let Some(c) = key_iter.next() {
+            buffer[index] = *c;
+            index += 1;
+            if *c == b'-' {
+                if let Some(c) = key_iter.next() {
+                    if *c >= b'a' && *c <= b'z' {
+                        buffer[index] = *c ^ b' ';
+                        index += 1;
+                    }
+                }
+            }
+        }
+    }
+}

actix-http/examples/h2c-detect.rs

@@ -1,29 +0,0 @@
-//! An example that supports automatic selection of plaintext h1/h2c connections.
-//!
-//! Notably, both the following commands will work.
-//! ```console
-//! $ curl --http1.1 'http://localhost:8080/'
-//! $ curl --http2-prior-knowledge 'http://localhost:8080/'
-//! ```
-
-use std::{convert::Infallible, io};
-
-use actix_http::{HttpService, Request, Response, StatusCode};
-use actix_server::Server;
-
-#[tokio::main(flavor = "current_thread")]
-async fn main() -> io::Result<()> {
-    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
-
-    Server::build()
-        .bind("h2c-detect", ("127.0.0.1", 8080), || {
-            HttpService::build()
-                .finish(|_req: Request| async move {
-                    Ok::<_, Infallible>(Response::build(StatusCode::OK).body("Hello!"))
-                })
-                .tcp_auto_h2c()
-        })?
-        .workers(2)
-        .run()
-        .await
-}

actix-http/examples/ws.rs

@@ -10,13 +10,13 @@ use std::{
     time::Duration,
 };
 
+use actix_codec::Encoder;
 use actix_http::{body::BodyStream, error::Error, ws, HttpService, Request, Response};
 use actix_rt::time::{interval, Interval};
 use actix_server::Server;
 use bytes::{Bytes, BytesMut};
 use bytestring::ByteString;
 use futures_core::{ready, Stream};
-use tokio_util::codec::Encoder;
 use tracing::{info, trace};
 
 #[actix_rt::main]

actix-http/src/body/message_body.rs

@@ -120,28 +120,8 @@ pub trait MessageBody {
 }
 
 mod foreign_impls {
-    use std::{borrow::Cow, ops::DerefMut};
-
     use super::*;
 
-    impl<B> MessageBody for &mut B
-    where
-        B: MessageBody + Unpin + ?Sized,
-    {
-        type Error = B::Error;
-
-        fn size(&self) -> BodySize {
-            (**self).size()
-        }
-
-        fn poll_next(
-            mut self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-        ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-            Pin::new(&mut **self).poll_next(cx)
-        }
-    }
-
     impl MessageBody for Infallible {
         type Error = Infallible;
 
@@ -199,9 +179,8 @@ mod foreign_impls {
         }
     }
 
-    impl<T, B> MessageBody for Pin<T>
+    impl<B> MessageBody for Pin<Box<B>>
     where
-        T: DerefMut<Target = B> + Unpin,
         B: MessageBody + ?Sized,
     {
         type Error = B::Error;
@@ -324,39 +303,6 @@ mod foreign_impls {
         }
     }
 
-    impl MessageBody for Cow<'static, [u8]> {
-        type Error = Infallible;
-
-        #[inline]
-        fn size(&self) -> BodySize {
-            BodySize::Sized(self.len() as u64)
-        }
-
-        #[inline]
-        fn poll_next(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-        ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-            if self.is_empty() {
-                Poll::Ready(None)
-            } else {
-                let bytes = match mem::take(self.get_mut()) {
-                    Cow::Borrowed(b) => Bytes::from_static(b),
-                    Cow::Owned(b) => Bytes::from(b),
-                };
-                Poll::Ready(Some(Ok(bytes)))
-            }
-        }
-
-        #[inline]
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            match self {
-                Cow::Borrowed(b) => Ok(Bytes::from_static(b)),
-                Cow::Owned(b) => Ok(Bytes::from(b)),
-            }
-        }
-    }
-
     impl MessageBody for &'static str {
         type Error = Infallible;
 
@@ -412,39 +358,6 @@ mod foreign_impls {
         }
     }
 
-    impl MessageBody for Cow<'static, str> {
-        type Error = Infallible;
-
-        #[inline]
-        fn size(&self) -> BodySize {
-            BodySize::Sized(self.len() as u64)
-        }
-
-        #[inline]
-        fn poll_next(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-        ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-            if self.is_empty() {
-                Poll::Ready(None)
-            } else {
-                let bytes = match mem::take(self.get_mut()) {
-                    Cow::Borrowed(s) => Bytes::from_static(s.as_bytes()),
-                    Cow::Owned(s) => Bytes::from(s.into_bytes()),
-                };
-                Poll::Ready(Some(Ok(bytes)))
-            }
-        }
-
-        #[inline]
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            match self {
-                Cow::Borrowed(s) => Ok(Bytes::from_static(s.as_bytes())),
-                Cow::Owned(s) => Ok(Bytes::from(s.into_bytes())),
-            }
-        }
-    }
-
     impl MessageBody for bytestring::ByteString {
         type Error = Infallible;
 
@@ -532,7 +445,6 @@ mod tests {
     use actix_rt::pin;
     use actix_utils::future::poll_fn;
     use bytes::{Bytes, BytesMut};
-    use futures_util::stream;
 
     use super::*;
     use crate::body::{self, EitherBody};
@@ -569,34 +481,6 @@ mod tests {
         assert_poll_next_none!(pl);
     }
 
-    #[actix_rt::test]
-    async fn mut_equivalence() {
-        assert_eq!(().size(), BodySize::Sized(0));
-        assert_eq!(().size(), (&(&mut ())).size());
-
-        let pl = &mut ();
-        pin!(pl);
-        assert_poll_next_none!(pl);
-
-        let pl = &mut Box::new(());
-        pin!(pl);
-        assert_poll_next_none!(pl);
-
-        let mut body = body::SizedStream::new(
-            8,
-            stream::iter([
-                Ok::<_, std::io::Error>(Bytes::from("1234")),
-                Ok(Bytes::from("5678")),
-            ]),
-        );
-        let body = &mut body;
-        assert_eq!(body.size(), BodySize::Sized(8));
-        pin!(body);
-        assert_poll_next!(body, Bytes::from_static(b"1234"));
-        assert_poll_next!(body, Bytes::from_static(b"5678"));
-        assert_poll_next_none!(body);
-    }
-
     #[allow(clippy::let_unit_value)]
     #[actix_rt::test]
     async fn test_unit() {
@@ -723,18 +607,4 @@ mod tests {
         let not_body = resp_body.downcast_ref::<()>();
         assert!(not_body.is_none());
     }
-
-    #[actix_rt::test]
-    async fn non_owning_to_bytes() {
-        let mut body = BoxBody::new(());
-        let bytes = body::to_bytes(&mut body).await.unwrap();
-        assert_eq!(bytes, Bytes::new());
-
-        let mut body = body::BodyStream::new(stream::iter([
-            Ok::<_, std::io::Error>(Bytes::from("1234")),
-            Ok(Bytes::from("5678")),
-        ]));
-        let bytes = body::to_bytes(&mut body).await.unwrap();
-        assert_eq!(bytes, Bytes::from_static(b"12345678"));
-    }
 }

actix-http/src/body/mod.rs

@@ -22,4 +22,4 @@ pub(crate) use self::message_body::MessageBodyMapErr;
 pub use self::none::None;
 pub use self::size::BodySize;
 pub use self::sized_stream::SizedStream;
-pub use self::utils::{to_bytes, to_bytes_limited, BodyLimitExceeded};
+pub use self::utils::to_bytes;

actix-http/src/body/sized_stream.rs

@@ -44,7 +44,7 @@ where
 
     #[inline]
     fn size(&self) -> BodySize {
-        BodySize::Sized(self.size)
+        BodySize::Sized(self.size as u64)
     }
 
     /// Attempts to pull out the next value of the underlying [`Stream`].

actix-http/src/body/utils.rs

@@ -3,196 +3,75 @@ use std::task::Poll;
 use actix_rt::pin;
 use actix_utils::future::poll_fn;
 use bytes::{Bytes, BytesMut};
-use derive_more::{Display, Error};
 use futures_core::ready;
 
 use super::{BodySize, MessageBody};
 
-/// Collects all the bytes produced by `body`.
+/// Collects the body produced by a `MessageBody` implementation into `Bytes`.
 ///
 /// Any errors produced by the body stream are returned immediately.
 ///
-/// Consider using [`to_bytes_limited`] instead to protect against memory exhaustion.
-///
 /// # Examples
-///
 /// ```
 /// use actix_http::body::{self, to_bytes};
 /// use bytes::Bytes;
 ///
-/// # actix_rt::System::new().block_on(async {
+/// # async fn test_to_bytes() {
 /// let body = body::None::new();
 /// let bytes = to_bytes(body).await.unwrap();
 /// assert!(bytes.is_empty());
 ///
 /// let body = Bytes::from_static(b"123");
 /// let bytes = to_bytes(body).await.unwrap();
-/// assert_eq!(bytes, "123");
-/// # });
+/// assert_eq!(bytes, b"123"[..]);
+/// # }
 /// ```
 pub async fn to_bytes<B: MessageBody>(body: B) -> Result<Bytes, B::Error> {
-    to_bytes_limited(body, usize::MAX)
-        .await
-        .expect("body should never yield more than usize::MAX bytes")
-}
-
-/// Error type returned from [`to_bytes_limited`] when body produced exceeds limit.
-#[derive(Debug, Display, Error)]
-#[display(fmt = "limit exceeded while collecting body bytes")]
-#[non_exhaustive]
-pub struct BodyLimitExceeded;
-
-/// Collects the bytes produced by `body`, up to `limit` bytes.
-///
-/// If a chunk read from `poll_next` causes the total number of bytes read to exceed `limit`, an
-/// `Err(BodyLimitExceeded)` is returned.
-///
-/// Any errors produced by the body stream are returned immediately as `Ok(Err(B::Error))`.
-///
-/// # Examples
-///
-/// ```
-/// use actix_http::body::{self, to_bytes_limited};
-/// use bytes::Bytes;
-///
-/// # actix_rt::System::new().block_on(async {
-/// let body = body::None::new();
-/// let bytes = to_bytes_limited(body, 10).await.unwrap().unwrap();
-/// assert!(bytes.is_empty());
-///
-/// let body = Bytes::from_static(b"123");
-/// let bytes = to_bytes_limited(body, 10).await.unwrap().unwrap();
-/// assert_eq!(bytes, "123");
-///
-/// let body = Bytes::from_static(b"123");
-/// assert!(to_bytes_limited(body, 2).await.is_err());
-/// # });
-/// ```
-pub async fn to_bytes_limited<B: MessageBody>(
-    body: B,
-    limit: usize,
-) -> Result<Result<Bytes, B::Error>, BodyLimitExceeded> {
-    /// Sensible default (32kB) for initial, bounded allocation when collecting body bytes.
-    const INITIAL_ALLOC_BYTES: usize = 32 * 1024;
-
     let cap = match body.size() {
-        BodySize::None | BodySize::Sized(0) => return Ok(Ok(Bytes::new())),
-        BodySize::Sized(size) if size as usize > limit => return Err(BodyLimitExceeded),
-        BodySize::Sized(size) => (size as usize).min(INITIAL_ALLOC_BYTES),
-        BodySize::Stream => INITIAL_ALLOC_BYTES,
+        BodySize::None | BodySize::Sized(0) => return Ok(Bytes::new()),
+        BodySize::Sized(size) => size as usize,
+        // good enough first guess for chunk size
+        BodySize::Stream => 32_768,
     };
 
-    let mut exceeded_limit = false;
     let mut buf = BytesMut::with_capacity(cap);
 
     pin!(body);
 
-    match poll_fn(|cx| loop {
+    poll_fn(|cx| loop {
         let body = body.as_mut();
 
         match ready!(body.poll_next(cx)) {
-            Some(Ok(bytes)) => {
-                // if limit is exceeded...
-                if buf.len() + bytes.len() > limit {
-                    // ...set flag to true and break out of poll_fn
-                    exceeded_limit = true;
-                    return Poll::Ready(Ok(()));
-                }
-
-                buf.extend_from_slice(&bytes)
-            }
+            Some(Ok(bytes)) => buf.extend_from_slice(&*bytes),
             None => return Poll::Ready(Ok(())),
             Some(Err(err)) => return Poll::Ready(Err(err)),
         }
     })
-    .await
-    {
-        // propagate error returned from body poll
-        Err(err) => Ok(Err(err)),
+    .await?;
 
-        // limit was exceeded while reading body
-        Ok(()) if exceeded_limit => Err(BodyLimitExceeded),
-
-        // otherwise return body buffer
-        Ok(()) => Ok(Ok(buf.freeze())),
-    }
+    Ok(buf.freeze())
 }
 
 #[cfg(test)]
-mod tests {
-    use std::io;
-
+mod test {
     use futures_util::{stream, StreamExt as _};
 
     use super::*;
-    use crate::{
-        body::{BodyStream, SizedStream},
-        Error,
-    };
+    use crate::{body::BodyStream, Error};
 
     #[actix_rt::test]
-    async fn to_bytes_complete() {
+    async fn test_to_bytes() {
         let bytes = to_bytes(()).await.unwrap();
         assert!(bytes.is_empty());
 
         let body = Bytes::from_static(b"123");
         let bytes = to_bytes(body).await.unwrap();
         assert_eq!(bytes, b"123"[..]);
-    }
 
-    #[actix_rt::test]
-    async fn to_bytes_streams() {
         let stream = stream::iter(vec![Bytes::from_static(b"123"), Bytes::from_static(b"abc")])
             .map(Ok::<_, Error>);
         let body = BodyStream::new(stream);
         let bytes = to_bytes(body).await.unwrap();
         assert_eq!(bytes, b"123abc"[..]);
     }
-
-    #[actix_rt::test]
-    async fn to_bytes_limited_complete() {
-        let bytes = to_bytes_limited((), 0).await.unwrap().unwrap();
-        assert!(bytes.is_empty());
-
-        let bytes = to_bytes_limited((), 1).await.unwrap().unwrap();
-        assert!(bytes.is_empty());
-
-        assert!(to_bytes_limited(Bytes::from_static(b"12"), 0)
-            .await
-            .is_err());
-        assert!(to_bytes_limited(Bytes::from_static(b"12"), 1)
-            .await
-            .is_err());
-        assert!(to_bytes_limited(Bytes::from_static(b"12"), 2).await.is_ok());
-        assert!(to_bytes_limited(Bytes::from_static(b"12"), 3).await.is_ok());
-    }
-
-    #[actix_rt::test]
-    async fn to_bytes_limited_streams() {
-        // hinting a larger body fails
-        let body = SizedStream::new(8, stream::empty().map(Ok::<_, Error>));
-        assert!(to_bytes_limited(body, 3).await.is_err());
-
-        // hinting a smaller body is okay
-        let body = SizedStream::new(3, stream::empty().map(Ok::<_, Error>));
-        assert!(to_bytes_limited(body, 3).await.unwrap().unwrap().is_empty());
-
-        // hinting a smaller body then returning a larger one fails
-        let stream = stream::iter(vec![Bytes::from_static(b"1234")]).map(Ok::<_, Error>);
-        let body = SizedStream::new(3, stream);
-        assert!(to_bytes_limited(body, 3).await.is_err());
-
-        let stream = stream::iter(vec![Bytes::from_static(b"123"), Bytes::from_static(b"abc")])
-            .map(Ok::<_, Error>);
-        let body = BodyStream::new(stream);
-        assert!(to_bytes_limited(body, 3).await.is_err());
-    }
-
-    #[actix_rt::test]
-    async fn to_body_limit_error() {
-        let err_stream = stream::once(async { Err(io::Error::new(io::ErrorKind::Other, "")) });
-        let body = SizedStream::new(8, err_stream);
-        // not too big, but propagates error from body stream
-        assert!(to_bytes_limited(body, 10).await.unwrap().is_err());
-    }
 }

actix-http/src/builder.rs

@@ -186,7 +186,7 @@ where
         self
     }
 
-    /// Finish service configuration and create a service for the HTTP/1 protocol.
+    /// Finish service configuration and create a HTTP Service for HTTP/1 protocol.
     pub fn h1<F, B>(self, service: F) -> H1Service<T, S, B, X, U>
     where
         B: MessageBody,
@@ -209,7 +209,7 @@ where
             .on_connect_ext(self.on_connect_ext)
     }
 
-    /// Finish service configuration and create a service for the HTTP/2 protocol.
+    /// Finish service configuration and create a HTTP service for HTTP/2 protocol.
     #[cfg(feature = "http2")]
     pub fn h2<F, B>(self, service: F) -> crate::h2::H2Service<T, S, B>
     where

actix-http/src/config.rs

@@ -35,7 +35,7 @@ impl Default for ServiceConfig {
 }
 
 impl ServiceConfig {
-    /// Create instance of `ServiceConfig`.
+    /// Create instance of `ServiceConfig`
     pub fn new(
         keep_alive: KeepAlive,
         client_request_timeout: Duration,

actix-http/src/error.rs

@@ -161,44 +161,44 @@ impl From<crate::ws::ProtocolError> for Error {
 #[non_exhaustive]
 pub enum ParseError {
     /// An invalid `Method`, such as `GE.T`.
-    #[display(fmt = "invalid method specified")]
+    #[display(fmt = "Invalid Method specified")]
     Method,
 
     /// An invalid `Uri`, such as `exam ple.domain`.
-    #[display(fmt = "URI error: {}", _0)]
+    #[display(fmt = "Uri error: {}", _0)]
     Uri(InvalidUri),
 
     /// An invalid `HttpVersion`, such as `HTP/1.1`
-    #[display(fmt = "invalid HTTP version specified")]
+    #[display(fmt = "Invalid HTTP version specified")]
     Version,
 
     /// An invalid `Header`.
-    #[display(fmt = "invalid Header provided")]
+    #[display(fmt = "Invalid Header provided")]
     Header,
 
     /// A message head is too large to be reasonable.
-    #[display(fmt = "message head is too large")]
+    #[display(fmt = "Message head is too large")]
     TooLarge,
 
     /// A message reached EOF, but is not complete.
-    #[display(fmt = "message is incomplete")]
+    #[display(fmt = "Message is incomplete")]
     Incomplete,
 
     /// An invalid `Status`, such as `1337 ELITE`.
-    #[display(fmt = "invalid status provided")]
+    #[display(fmt = "Invalid Status provided")]
     Status,
 
     /// A timeout occurred waiting for an IO event.
     #[allow(dead_code)]
-    #[display(fmt = "timeout")]
+    #[display(fmt = "Timeout")]
     Timeout,
 
-    /// An I/O error that occurred while trying to read or write to a network stream.
-    #[display(fmt = "I/O error: {}", _0)]
+    /// An `io::Error` that occurred while trying to read or write to a network stream.
+    #[display(fmt = "IO error: {}", _0)]
     Io(io::Error),
 
     /// Parsing a field as string failed.
-    #[display(fmt = "UTF-8 error: {}", _0)]
+    #[display(fmt = "UTF8 error: {}", _0)]
     Utf8(Utf8Error),
 }
 
@@ -257,19 +257,22 @@ impl From<ParseError> for Response<BoxBody> {
 #[non_exhaustive]
 pub enum PayloadError {
     /// A payload reached EOF, but is not complete.
-    #[display(fmt = "payload reached EOF before completing: {:?}", _0)]
+    #[display(
+        fmt = "A payload reached EOF, but is not complete. Inner error: {:?}",
+        _0
+    )]
     Incomplete(Option<io::Error>),
 
     /// Content encoding stream corruption.
-    #[display(fmt = "can not decode content-encoding")]
+    #[display(fmt = "Can not decode content-encoding.")]
     EncodingCorrupted,
 
     /// Payload reached size limit.
-    #[display(fmt = "payload reached size limit")]
+    #[display(fmt = "Payload reached size limit.")]
     Overflow,
 
     /// Payload length is unknown.
-    #[display(fmt = "payload length is unknown")]
+    #[display(fmt = "Payload length is unknown.")]
     UnknownLength,
 
     /// HTTP/2 payload error.
@@ -327,23 +330,22 @@ impl From<PayloadError> for Error {
 #[non_exhaustive]
 pub enum DispatchError {
     /// Service error.
-    #[display(fmt = "service error")]
+    #[display(fmt = "Service Error")]
     Service(Response<BoxBody>),
 
     /// Body streaming error.
-    #[display(fmt = "body error: {}", _0)]
+    #[display(fmt = "Body error: {}", _0)]
     Body(Box<dyn StdError>),
 
     /// Upgrade service error.
-    #[display(fmt = "upgrade error")]
     Upgrade,
 
     /// An `io::Error` that occurred while trying to read or write to a network stream.
-    #[display(fmt = "I/O error: {}", _0)]
+    #[display(fmt = "IO error: {}", _0)]
     Io(io::Error),
 
     /// Request parse error.
-    #[display(fmt = "request parse error: {}", _0)]
+    #[display(fmt = "Request parse error: {}", _0)]
     Parse(ParseError),
 
     /// HTTP/2 error.
@@ -352,19 +354,19 @@ pub enum DispatchError {
     H2(h2::Error),
 
     /// The first request did not complete within the specified timeout.
-    #[display(fmt = "request did not complete within the specified timeout")]
+    #[display(fmt = "The first request did not complete within the specified timeout")]
     SlowRequestTimeout,
 
-    /// Disconnect timeout. Makes sense for TLS streams.
-    #[display(fmt = "connection shutdown timeout")]
+    /// Disconnect timeout. Makes sense for ssl streams.
+    #[display(fmt = "Connection shutdown timeout")]
     DisconnectTimeout,
 
     /// Handler dropped payload before reading EOF.
-    #[display(fmt = "handler dropped payload before reading EOF")]
+    #[display(fmt = "Handler dropped payload before reading EOF")]
     HandlerDroppedPayload,
 
     /// Internal error.
-    #[display(fmt = "internal error")]
+    #[display(fmt = "Internal error")]
     InternalError,
 }
 
@@ -386,15 +388,15 @@ impl StdError for DispatchError {
 
 /// A set of error that can occur during parsing content type.
 #[derive(Debug, Display, Error)]
-#[cfg_attr(test, derive(PartialEq, Eq))]
+#[cfg_attr(test, derive(PartialEq))]
 #[non_exhaustive]
 pub enum ContentTypeError {
-    /// Can not parse content type.
-    #[display(fmt = "could not parse content type")]
+    /// Can not parse content type
+    #[display(fmt = "Can not parse content type")]
     ParseError,
 
-    /// Unknown content encoding.
-    #[display(fmt = "unknown content encoding")]
+    /// Unknown content encoding
+    #[display(fmt = "Unknown content encoding")]
     UnknownEncoding,
 }
 
@@ -422,7 +424,7 @@ mod tests {
         let err: Error = ParseError::Io(orig).into();
         assert_eq!(
             format!("{}", err),
-            "error parsing HTTP message: I/O error: other"
+            "error parsing HTTP message: IO error: other"
         );
     }
 
@@ -449,7 +451,7 @@ mod tests {
         let err = PayloadError::Incomplete(None);
         assert_eq!(
             err.to_string(),
-            "payload reached EOF before completing: None"
+            "A payload reached EOF, but is not complete. Inner error: None"
         );
     }
 
@@ -469,7 +471,7 @@ mod tests {
             match ParseError::from($from) {
                 e @ $error => {
                     let desc = format!("{}", e);
-                    assert_eq!(desc, format!("I/O error: {}", $from));
+                    assert_eq!(desc, format!("IO error: {}", $from));
                 }
                 _ => unreachable!("{:?}", $from),
             }

actix-http/src/extensions.rs

@@ -1,30 +1,9 @@
 use std::{
     any::{Any, TypeId},
-    collections::HashMap,
     fmt,
-    hash::{BuildHasherDefault, Hasher},
 };
 
-/// A hasher for `TypeId`s that takes advantage of its known characteristics.
-///
-/// Author of `anymap` crate has done research on the topic:
-/// https://github.com/chris-morgan/anymap/blob/2e9a5704/src/lib.rs#L599
-#[derive(Debug, Default)]
-struct NoOpHasher(u64);
-
-impl Hasher for NoOpHasher {
-    fn write(&mut self, _bytes: &[u8]) {
-        unimplemented!("This NoOpHasher can only handle u64s")
-    }
-
-    fn write_u64(&mut self, i: u64) {
-        self.0 = i;
-    }
-
-    fn finish(&self) -> u64 {
-        self.0
-    }
-}
+use ahash::AHashMap;
 
 /// A type map for request extensions.
 ///
@@ -32,7 +11,7 @@ impl Hasher for NoOpHasher {
 #[derive(Default)]
 pub struct Extensions {
     /// Use AHasher with a std HashMap with for faster lookups on the small `TypeId` keys.
-    map: HashMap<TypeId, Box<dyn Any>, BuildHasherDefault<NoOpHasher>>,
+    map: AHashMap<TypeId, Box<dyn Any>>,
 }
 
 impl Extensions {
@@ -40,7 +19,7 @@ impl Extensions {
     #[inline]
     pub fn new() -> Extensions {
         Extensions {
-            map: HashMap::default(),
+            map: AHashMap::new(),
         }
     }
 

actix-http/src/h1/chunked.rs

@@ -15,7 +15,7 @@ macro_rules! byte (
     })
 );
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Clone)]
 pub(super) enum ChunkedState {
     Size,
     SizeLws,
@@ -71,7 +71,7 @@ impl ChunkedState {
 
         match size.checked_mul(radix) {
             Some(n) => {
-                *size = n;
+                *size = n as u64;
                 *size += rem as u64;
 
                 Poll::Ready(Ok(ChunkedState::Size))

actix-http/src/h1/client.rs

@@ -1,9 +1,9 @@
 use std::{fmt, io};
 
+use actix_codec::{Decoder, Encoder};
 use bitflags::bitflags;
 use bytes::{Bytes, BytesMut};
 use http::{Method, Version};
-use tokio_util::codec::{Decoder, Encoder};
 
 use super::{
     decoder::{self, PayloadDecoder, PayloadItem, PayloadType},

actix-http/src/h1/codec.rs

@@ -1,9 +1,9 @@
 use std::{fmt, io};
 
+use actix_codec::{Decoder, Encoder};
 use bitflags::bitflags;
 use bytes::BytesMut;
 use http::{Method, Version};
-use tokio_util::codec::{Decoder, Encoder};
 
 use super::{
     decoder::{self, PayloadDecoder, PayloadItem, PayloadType},

actix-http/src/h1/decoder.rs

@@ -440,7 +440,7 @@ impl HeaderIndex {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 /// Chunk type yielded while decoding a payload.
 pub enum PayloadItem {
     Chunk(Bytes),
@@ -450,7 +450,7 @@ pub enum PayloadItem {
 /// Decoder that can handle different payload types.
 ///
 /// If a message body does not use `Transfer-Encoding`, it should include a `Content-Length`.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct PayloadDecoder {
     kind: Kind,
 }
@@ -476,7 +476,7 @@ impl PayloadDecoder {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 enum Kind {
     /// A reader used when a `Content-Length` header is passed with a positive integer.
     Length(u64),

actix-http/src/h1/dispatcher.rs

@@ -8,15 +8,13 @@ use std::{
     task::{Context, Poll},
 };
 
-use actix_codec::{Framed, FramedParts};
+use actix_codec::{AsyncRead, AsyncWrite, Decoder as _, Encoder as _, Framed, FramedParts};
 use actix_rt::time::sleep_until;
 use actix_service::Service;
 use bitflags::bitflags;
 use bytes::{Buf, BytesMut};
 use futures_core::ready;
 use pin_project_lite::pin_project;
-use tokio::io::{AsyncRead, AsyncWrite};
-use tokio_util::codec::{Decoder as _, Encoder as _};
 use tracing::{error, trace};
 
 use crate::{
@@ -978,11 +976,9 @@ where
                 //
                 // A Request head too large to parse is only checked on `httparse::Status::Partial`.
 
-                match this.payload {
-                    // When dispatcher has a payload the responsibility of wake ups is shifted to
-                    // `h1::payload::Payload` unless the payload is needing a read, in which case it
-                    // might not have access to the waker and could result in the dispatcher
-                    // getting stuck until timeout.
+                if this.payload.is_none() {
+                    // When dispatcher has a payload the responsibility of wake up it would be shift
+                    // to h1::payload::Payload.
                     //
                     // Reason:
                     // Self wake up when there is payload would waste poll and/or result in
@@ -993,8 +989,7 @@ where
                     // read anymore. At this case read_buf could always remain beyond
                     // MAX_BUFFER_SIZE and self wake up would be busy poll dispatcher and
                     // waste resources.
-                    Some(ref p) if p.need_read(cx) != PayloadStatus::Read => {}
-                    _ => cx.waker().wake_by_ref(),
+                    cx.waker().wake_by_ref();
                 }
 
                 return Ok(false);
@@ -1006,7 +1001,7 @@ where
                 this.read_buf.reserve(HW_BUFFER_SIZE - remaining);
             }
 
-            match tokio_util::io::poll_read_buf(io.as_mut(), cx, this.read_buf) {
+            match actix_codec::poll_read_buf(io.as_mut(), cx, this.read_buf) {
                 Poll::Ready(Ok(n)) => {
                     this.flags.remove(Flags::FINISHED);
 

actix-http/src/h1/dispatcher_tests.rs

@@ -64,7 +64,7 @@ fn drop_payload_service(
 fn echo_payload_service() -> impl Service<Request, Response = Response<Bytes>, Error = Error> {
     fn_service(|mut req: Request| {
         Box::pin(async move {
-            use futures_util::StreamExt as _;
+            use futures_util::stream::StreamExt as _;
 
             let mut pl = req.take_payload();
             let mut body = BytesMut::new();
@@ -637,7 +637,7 @@ async fn expect_handling() {
 
         if let DispatcherState::Normal { ref inner } = h1.inner {
             let io = inner.io.as_ref().unwrap();
-            let mut res = io.write_buf()[..].to_owned();
+            let mut res = (&io.write_buf()[..]).to_owned();
             stabilize_date_header(&mut res);
 
             assert_eq!(
@@ -699,7 +699,7 @@ async fn expect_eager() {
 
         if let DispatcherState::Normal { ref inner } = h1.inner {
             let io = inner.io.as_ref().unwrap();
-            let mut res = io.write_buf()[..].to_owned();
+            let mut res = (&io.write_buf()[..]).to_owned();
             stabilize_date_header(&mut res);
 
             // Despite the content-length header and even though the request payload has not
@@ -932,6 +932,7 @@ fn http_msg(msg: impl AsRef<str>) -> BytesMut {
         .as_ref()
         .trim()
         .split('\n')
+        .into_iter()
         .map(|line| [line.trim_start(), "\r"].concat())
         .collect::<Vec<_>>()
         .join("\n");

actix-http/src/h1/encoder.rs

@@ -450,7 +450,7 @@ impl TransferEncoding {
 
                     buf.extend_from_slice(&msg[..len as usize]);
 
-                    *remaining -= len;
+                    *remaining -= len as u64;
                     Ok(*remaining == 0)
                 } else {
                     Ok(true)

actix-http/src/h1/payload.rs

@@ -16,7 +16,7 @@ use crate::error::PayloadError;
 /// max buffer size 32k
 pub(crate) const MAX_BUFFER_SIZE: usize = 32_768;
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq)]
 pub enum PayloadStatus {
     Read,
     Pause,
@@ -252,15 +252,19 @@ impl Inner {
 
 #[cfg(test)]
 mod tests {
+    use std::panic::{RefUnwindSafe, UnwindSafe};
+
     use actix_utils::future::poll_fn;
     use static_assertions::{assert_impl_all, assert_not_impl_any};
 
     use super::*;
 
     assert_impl_all!(Payload: Unpin);
-    assert_not_impl_any!(Payload: Send, Sync);
+    assert_not_impl_any!(Payload: Send, Sync, UnwindSafe, RefUnwindSafe);
 
     assert_impl_all!(Inner: Unpin, Send, Sync);
+    // assertion not stable wrt rustc versions yet
+    // assert_impl_all!(Inner: UnwindSafe, RefUnwindSafe);
 
     #[actix_rt::test]
     async fn test_unread_data() {

actix-http/src/h2/dispatcher.rs

@@ -29,7 +29,7 @@ use crate::{
         HeaderName, HeaderValue, CONNECTION, CONTENT_LENGTH, DATE, TRANSFER_ENCODING, UPGRADE,
     },
     service::HttpFlow,
-    Extensions, Method, OnConnectData, Payload, Request, Response, ResponseHead,
+    Extensions, OnConnectData, Payload, Request, Response, ResponseHead,
 };
 
 const CHUNK_SIZE: usize = 16_384;
@@ -67,7 +67,7 @@ where
                     timer
                 })
                 .unwrap_or_else(|| Box::pin(sleep(dur))),
-            in_flight: false,
+            on_flight: false,
             ping_pong: conn.ping_pong().unwrap(),
         });
 
@@ -84,14 +84,9 @@ where
 }
 
 struct H2PingPong {
-    /// Handle to send ping frames from the peer.
-    ping_pong: PingPong,
-
-    /// True when a ping has been sent and is waiting for a reply.
-    in_flight: bool,
-
-    /// Timeout for pong response.
     timer: Pin<Box<Sleep>>,
+    on_flight: bool,
+    ping_pong: PingPong,
 }
 
 impl<T, S, B, X, U> Future for Dispatcher<T, S, B, X, U>
@@ -118,7 +113,6 @@ where
                     let payload = crate::h2::Payload::new(body);
                     let pl = Payload::H2 { payload };
                     let mut req = Request::with_payload(pl);
-                    let head_req = parts.method == Method::HEAD;
 
                     let head = req.head_mut();
                     head.uri = parts.uri;
@@ -136,10 +130,10 @@ where
                     actix_rt::spawn(async move {
                         // resolve service call and send response.
                         let res = match fut.await {
-                            Ok(res) => handle_response(res.into(), tx, config, head_req).await,
+                            Ok(res) => handle_response(res.into(), tx, config).await,
                             Err(err) => {
                                 let res: Response<BoxBody> = err.into();
-                                handle_response(res, tx, config, head_req).await
+                                handle_response(res, tx, config).await
                             }
                         };
 
@@ -158,28 +152,26 @@ where
                     });
                 }
                 Poll::Ready(None) => return Poll::Ready(Ok(())),
-
                 Poll::Pending => match this.ping_pong.as_mut() {
                     Some(ping_pong) => loop {
-                        if ping_pong.in_flight {
-                            // When there is an in-flight ping-pong, poll pong and and keep-alive
-                            // timer. On successful pong received, update keep-alive timer to
-                            // determine the next timing of ping pong.
+                        if ping_pong.on_flight {
+                            // When have on flight ping pong. poll pong and and keep alive timer.
+                            // on success pong received update keep alive timer to determine the next timing of
+                            // ping pong.
                             match ping_pong.ping_pong.poll_pong(cx)? {
                                 Poll::Ready(_) => {
-                                    ping_pong.in_flight = false;
+                                    ping_pong.on_flight = false;
 
                                     let dead_line = this.config.keep_alive_deadline().unwrap();
                                     ping_pong.timer.as_mut().reset(dead_line.into());
                                 }
                                 Poll::Pending => {
-                                    return ping_pong.timer.as_mut().poll(cx).map(|_| Ok(()));
+                                    return ping_pong.timer.as_mut().poll(cx).map(|_| Ok(()))
                                 }
                             }
                         } else {
-                            // When there is no in-flight ping-pong, keep-alive timer is used to
-                            // wait for next timing of ping-pong. Therefore, at this point it serves
-                            // as an interval instead.
+                            // When there is no on flight ping pong. keep alive timer is used to wait for next
+                            // timing of ping pong. Therefore at this point it serves as an interval instead.
                             ready!(ping_pong.timer.as_mut().poll(cx));
 
                             ping_pong.ping_pong.send_ping(Ping::opaque())?;
@@ -187,7 +179,7 @@ where
                             let dead_line = this.config.keep_alive_deadline().unwrap();
                             ping_pong.timer.as_mut().reset(dead_line.into());
 
-                            ping_pong.in_flight = true;
+                            ping_pong.on_flight = true;
                         }
                     },
                     None => return Poll::Pending,
@@ -207,7 +199,6 @@ async fn handle_response<B>(
     res: Response<B>,
     mut tx: SendResponse<Bytes>,
     config: ServiceConfig,
-    head_req: bool,
 ) -> Result<(), DispatchError>
 where
     B: MessageBody,
@@ -217,14 +208,14 @@ where
     // prepare response.
     let mut size = body.size();
     let res = prepare_response(config, res.head(), &mut size);
-    let eof_or_head = size.is_eof() || head_req;
+    let eof = size.is_eof();
 
     // send response head and return on eof.
     let mut stream = tx
-        .send_response(res, eof_or_head)
+        .send_response(res, eof)
         .map_err(DispatchError::SendResponse)?;
 
-    if eof_or_head {
+    if eof {
         return Ok(());
     }
 
@@ -296,13 +287,13 @@ fn prepare_response(
         _ => {}
     }
 
-    match size {
-        BodySize::None | BodySize::Stream => {}
+    let _ = match size {
+        BodySize::None | BodySize::Stream => None,
 
         BodySize::Sized(0) => {
             #[allow(clippy::declare_interior_mutable_const)]
             const HV_ZERO: HeaderValue = HeaderValue::from_static("0");
-            res.headers_mut().insert(CONTENT_LENGTH, HV_ZERO);
+            res.headers_mut().insert(CONTENT_LENGTH, HV_ZERO)
         }
 
         BodySize::Sized(len) => {
@@ -311,7 +302,7 @@ fn prepare_response(
             res.headers_mut().insert(
                 CONTENT_LENGTH,
                 HeaderValue::from_str(buf.format(*len)).unwrap(),
-            );
+            )
         }
     };
 

actix-http/src/h2/mod.rs

@@ -103,9 +103,11 @@ where
 
 #[cfg(test)]
 mod tests {
+    use std::panic::{RefUnwindSafe, UnwindSafe};
+
     use static_assertions::assert_impl_all;
 
     use super::*;
 
-    assert_impl_all!(Payload: Unpin, Send, Sync);
+    assert_impl_all!(Payload: Unpin, Send, Sync, UnwindSafe, RefUnwindSafe);
 }

actix-http/src/header/common.rs

@@ -1,53 +0,0 @@
-//! Common header names not defined in [`http`].
-//!
-//! Any headers added to this file will need to be re-exported from the list at `crate::headers`.
-
-use http::header::HeaderName;
-
-/// Response header field that indicates how caches have handled that response and its corresponding
-/// request.
-///
-/// See [RFC 9211](https://www.rfc-editor.org/rfc/rfc9211) for full semantics.
-// TODO(breaking): replace with http's version
-pub const CACHE_STATUS: HeaderName = HeaderName::from_static("cache-status");
-
-/// Response header field that allows origin servers to control the behavior of CDN caches
-/// interposed between them and clients separately from other caches that might handle the response.
-///
-/// See [RFC 9213](https://www.rfc-editor.org/rfc/rfc9213) for full semantics.
-// TODO(breaking): replace with http's version
-pub const CDN_CACHE_CONTROL: HeaderName = HeaderName::from_static("cdn-cache-control");
-
-/// Response header that prevents a document from loading any cross-origin resources that don't
-/// explicitly grant the document permission (using [CORP] or [CORS]).
-///
-/// [CORP]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Cross-Origin_Resource_Policy_(CORP)
-/// [CORS]: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
-pub const CROSS_ORIGIN_EMBEDDER_POLICY: HeaderName =
-    HeaderName::from_static("cross-origin-embedder-policy");
-
-/// Response header that allows you to ensure a top-level document does not share a browsing context
-/// group with cross-origin documents.
-pub const CROSS_ORIGIN_OPENER_POLICY: HeaderName =
-    HeaderName::from_static("cross-origin-opener-policy");
-
-/// Response header that conveys a desire that the browser blocks no-cors cross-origin/cross-site
-/// requests to the given resource.
-pub const CROSS_ORIGIN_RESOURCE_POLICY: HeaderName =
-    HeaderName::from_static("cross-origin-resource-policy");
-
-/// Response header that provides a mechanism to allow and deny the use of browser features in a
-/// document or within any `<iframe>` elements in the document.
-pub const PERMISSIONS_POLICY: HeaderName = HeaderName::from_static("permissions-policy");
-
-/// Request header (de-facto standard) for identifying the originating IP address of a client
-/// connecting to a web server through a proxy server.
-pub const X_FORWARDED_FOR: HeaderName = HeaderName::from_static("x-forwarded-for");
-
-/// Request header (de-facto standard) for identifying the original host requested by the client in
-/// the `Host` HTTP request header.
-pub const X_FORWARDED_HOST: HeaderName = HeaderName::from_static("x-forwarded-host");
-
-/// Request header (de-facto standard) for identifying the protocol that a client used to connect to
-/// your proxy or load balancer.
-pub const X_FORWARDED_PROTO: HeaderName = HeaderName::from_static("x-forwarded-proto");

actix-http/src/header/map.rs

@@ -150,7 +150,9 @@ impl HeaderMap {
     /// assert_eq!(map.len(), 3);
     /// ```
     pub fn len(&self) -> usize {
-        self.inner.values().map(|vals| vals.len()).sum()
+        self.inner
+            .iter()
+            .fold(0, |acc, (_, values)| acc + values.len())
     }
 
     /// Returns the number of _keys_ stored in the map.
@@ -307,7 +309,7 @@ impl HeaderMap {
     pub fn get_all(&self, key: impl AsHeaderName) -> std::slice::Iter<'_, HeaderValue> {
         match self.get_value(key) {
             Some(value) => value.iter(),
-            None => [].iter(),
+            None => (&[]).iter(),
         }
     }
 
@@ -550,39 +552,6 @@ impl HeaderMap {
         Keys(self.inner.keys())
     }
 
-    /// Retains only the headers specified by the predicate.
-    ///
-    /// In other words, removes all headers `(name, val)` for which `retain_fn(&name, &mut val)`
-    /// returns false.
-    ///
-    /// The order in which headers are visited should be considered arbitrary.
-    ///
-    /// # Examples
-    /// ```
-    /// # use actix_http::header::{self, HeaderMap, HeaderValue};
-    /// let mut map = HeaderMap::new();
-    ///
-    /// map.append(header::HOST, HeaderValue::from_static("duck.com"));
-    /// map.append(header::SET_COOKIE, HeaderValue::from_static("one=1"));
-    /// map.append(header::SET_COOKIE, HeaderValue::from_static("two=2"));
-    ///
-    /// map.retain(|name, val| val.as_bytes().starts_with(b"one"));
-    ///
-    /// assert_eq!(map.len(), 1);
-    /// assert!(map.contains_key(&header::SET_COOKIE));
-    /// ```
-    pub fn retain<F>(&mut self, mut retain_fn: F)
-    where
-        F: FnMut(&HeaderName, &mut HeaderValue) -> bool,
-    {
-        self.inner.retain(|name, vals| {
-            vals.inner.retain(|val| retain_fn(name, val));
-
-            // invariant: make sure newly empty value lists are removed
-            !vals.is_empty()
-        })
-    }
-
     /// Clears the map, returning all name-value sets as an iterator.
     ///
     /// Header names will only be yielded for the first value in each set. All items that are
@@ -974,55 +943,6 @@ mod tests {
         assert!(map.is_empty());
     }
 
-    #[test]
-    fn retain() {
-        let mut map = HeaderMap::new();
-
-        map.append(header::LOCATION, HeaderValue::from_static("/test"));
-        map.append(header::HOST, HeaderValue::from_static("duck.com"));
-        map.append(header::COOKIE, HeaderValue::from_static("one=1"));
-        map.append(header::COOKIE, HeaderValue::from_static("two=2"));
-
-        assert_eq!(map.len(), 4);
-
-        // by value
-        map.retain(|_, val| !val.as_bytes().contains(&b'/'));
-        assert_eq!(map.len(), 3);
-
-        // by name
-        map.retain(|name, _| name.as_str() != "cookie");
-        assert_eq!(map.len(), 1);
-
-        // keep but mutate value
-        map.retain(|_, val| {
-            *val = HeaderValue::from_static("replaced");
-            true
-        });
-        assert_eq!(map.len(), 1);
-        assert_eq!(map.get("host").unwrap(), "replaced");
-    }
-
-    #[test]
-    fn retain_removes_empty_value_lists() {
-        let mut map = HeaderMap::with_capacity(3);
-
-        map.append(header::HOST, HeaderValue::from_static("duck.com"));
-        map.append(header::HOST, HeaderValue::from_static("duck.com"));
-
-        assert_eq!(map.len(), 2);
-        assert_eq!(map.len_keys(), 1);
-        assert_eq!(map.inner.len(), 1);
-        assert_eq!(map.capacity(), 3);
-
-        // remove everything
-        map.retain(|_n, _v| false);
-
-        assert_eq!(map.len(), 0);
-        assert_eq!(map.len_keys(), 0);
-        assert_eq!(map.inner.len(), 0);
-        assert_eq!(map.capacity(), 3);
-    }
-
     #[test]
     fn entries_into_iter() {
         let mut map = HeaderMap::new();

actix-http/src/header/mod.rs

@@ -1,18 +1,14 @@
 //! Pre-defined `HeaderName`s, traits for parsing and conversion, and other header utility methods.
 
-// declaring new header consts will yield this error
-#![allow(clippy::declare_interior_mutable_const)]
-
 use percent_encoding::{AsciiSet, CONTROLS};
 
 // re-export from http except header map related items
-pub use ::http::header::{
+pub use http::header::{
     HeaderName, HeaderValue, InvalidHeaderName, InvalidHeaderValue, ToStrError,
 };
 
-// re-export const header names, list is explicit so that any updates to `common` module do not
-// conflict with this set
-pub use ::http::header::{
+// re-export const header names
+pub use http::header::{
     ACCEPT, ACCEPT_CHARSET, ACCEPT_ENCODING, ACCEPT_LANGUAGE, ACCEPT_RANGES,
     ACCESS_CONTROL_ALLOW_CREDENTIALS, ACCESS_CONTROL_ALLOW_HEADERS,
     ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN, ACCESS_CONTROL_EXPOSE_HEADERS,
@@ -34,30 +30,22 @@ pub use ::http::header::{
 use crate::{error::ParseError, HttpMessage};
 
 mod as_name;
-mod common;
 mod into_pair;
 mod into_value;
 pub mod map;
 mod shared;
 mod utils;
 
-pub use self::{
-    as_name::AsHeaderName,
-    into_pair::TryIntoHeaderPair,
-    into_value::TryIntoHeaderValue,
-    map::HeaderMap,
-    shared::{
-        parse_extended_value, q, Charset, ContentEncoding, ExtendedValue, HttpDate,
-        LanguageTag, Quality, QualityItem,
-    },
-    utils::{fmt_comma_delimited, from_comma_delimited, from_one_raw_str, http_percent_encode},
+pub use self::as_name::AsHeaderName;
+pub use self::into_pair::TryIntoHeaderPair;
+pub use self::into_value::TryIntoHeaderValue;
+pub use self::map::HeaderMap;
+pub use self::shared::{
+    parse_extended_value, q, Charset, ContentEncoding, ExtendedValue, HttpDate, LanguageTag,
+    Quality, QualityItem,
 };
-
-// re-export list is explicit so that any updates to `http` do not conflict with this set
-pub use self::common::{
-    CACHE_STATUS, CDN_CACHE_CONTROL, CROSS_ORIGIN_EMBEDDER_POLICY, CROSS_ORIGIN_OPENER_POLICY,
-    CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY, X_FORWARDED_FOR, X_FORWARDED_HOST,
-    X_FORWARDED_PROTO,
+pub use self::utils::{
+    fmt_comma_delimited, from_comma_delimited, from_one_raw_str, http_percent_encode,
 };
 
 /// An interface for types that already represent a valid header.

actix-http/src/header/shared/extended.rs

@@ -12,7 +12,7 @@ use crate::header::{Charset, HTTP_VALUE};
 /// - A character sequence representing the actual value (`value`), separated by single quotes.
 ///
 /// It is defined in [RFC 5987 §3.2](https://datatracker.ietf.org/doc/html/rfc5987#section-3.2).
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct ExtendedValue {
     /// The character set that is used to encode the `value` to a string.
     pub charset: Charset,

actix-http/src/header/shared/quality_item.rs

@@ -147,7 +147,7 @@ mod tests {
 
     // copy of encoding from actix-web headers
     #[allow(clippy::enum_variant_names)] // allow Encoding prefix on EncodingExt
-    #[derive(Debug, Clone, PartialEq, Eq)]
+    #[derive(Clone, PartialEq, Debug)]
     pub enum Encoding {
         Chunked,
         Brotli,

actix-http/src/lib.rs

@@ -21,12 +21,11 @@
 #![allow(
     clippy::type_complexity,
     clippy::too_many_arguments,
-    clippy::borrow_interior_mutable_const,
-    clippy::uninlined_format_args
+    clippy::borrow_interior_mutable_const
 )]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 pub use ::http::{uri, uri::Uri};
 pub use ::http::{Method, StatusCode, Version};

actix-http/src/message.rs

@@ -3,7 +3,7 @@ use std::{cell::RefCell, ops, rc::Rc};
 use bitflags::bitflags;
 
 /// Represents various types of connection
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Copy, Clone, PartialEq, Debug)]
 pub enum ConnectionType {
     /// Close connection after response.
     Close,

actix-http/src/payload.rs

@@ -97,10 +97,12 @@ where
 
 #[cfg(test)]
 mod tests {
+    use std::panic::{RefUnwindSafe, UnwindSafe};
+
     use static_assertions::{assert_impl_all, assert_not_impl_any};
 
     use super::*;
 
     assert_impl_all!(Payload: Unpin);
-    assert_not_impl_any!(Payload: Send, Sync);
+    assert_not_impl_any!(Payload: Send, Sync, UnwindSafe, RefUnwindSafe);
 }

actix-http/src/requests/request.rs

@@ -113,14 +113,14 @@ impl<P> Request<P> {
     #[inline]
     /// Http message part of the request
     pub fn head(&self) -> &RequestHead {
-        &self.head
+        &*self.head
     }
 
     #[inline]
     #[doc(hidden)]
     /// Mutable reference to a HTTP message part of the request
     pub fn head_mut(&mut self) -> &mut RequestHead {
-        &mut self.head
+        &mut *self.head
     }
 
     /// Mutable reference to the message's headers.

actix-http/src/responses/response.rs

@@ -83,13 +83,13 @@ impl<B> Response<B> {
     /// Returns a reference to the head of this response.
     #[inline]
     pub fn head(&self) -> &ResponseHead {
-        &self.head
+        &*self.head
     }
 
     /// Returns a mutable reference to the head of this response.
     #[inline]
     pub fn head_mut(&mut self) -> &mut ResponseHead {
-        &mut self.head
+        &mut *self.head
     }
 
     /// Returns the status code of this response.

actix-http/src/service.rs

@@ -24,39 +24,7 @@ use crate::{
     h1, ConnectCallback, OnConnectData, Protocol, Request, Response, ServiceConfig,
 };
 
-/// A [`ServiceFactory`] for HTTP/1.1 and HTTP/2 connections.
-///
-/// Use [`build`](Self::build) to begin constructing service. Also see [`HttpServiceBuilder`].
-///
-/// # Automatic HTTP Version Selection
-/// There are two ways to select the HTTP version of an incoming connection:
-/// - One is to rely on the ALPN information that is provided when using a TLS (HTTPS); both
-///   versions are supported automatically when using either of the `.rustls()` or `.openssl()`
-///   finalizing methods.
-/// - The other is to read the first few bytes of the TCP stream. This is the only viable approach
-///   for supporting H2C, which allows the HTTP/2 protocol to work over plaintext connections. Use
-///   the `.tcp_auto_h2c()` finalizing method to enable this behavior.
-///
-/// # Examples
-/// ```
-/// # use std::convert::Infallible;
-/// use actix_http::{HttpService, Request, Response, StatusCode};
-///
-/// // this service would constructed in an actix_server::Server
-///
-/// # actix_rt::System::new().block_on(async {
-/// HttpService::build()
-///     // the builder finalizing method, other finalizers would not return an `HttpService`
-///     .finish(|_req: Request| async move {
-///         Ok::<_, Infallible>(
-///             Response::build(StatusCode::OK).body("Hello!")
-///         )
-///     })
-///     // the service finalizing method method
-///     // you can use `.tcp_auto_h2c()`, `.rustls()`, or `.openssl()` instead of `.tcp()`
-///     .tcp();
-/// # })
-/// ```
+/// A `ServiceFactory` for HTTP/1.1 or HTTP/2 protocol.
 pub struct HttpService<T, S, B, X = h1::ExpectHandler, U = h1::UpgradeHandler> {
     srv: S,
     cfg: ServiceConfig,
@@ -195,9 +163,7 @@ where
     U::Error: fmt::Display + Into<Response<BoxBody>>,
     U::InitError: fmt::Debug,
 {
-    /// Creates TCP stream service from HTTP service.
-    ///
-    /// The resulting service only supports HTTP/1.x.
+    /// Create simple tcp stream service
     pub fn tcp(
         self,
     ) -> impl ServiceFactory<
@@ -213,45 +179,11 @@ where
         })
         .and_then(self)
     }
-
-    /// Creates TCP stream service from HTTP service that automatically selects HTTP/1.x or HTTP/2
-    /// on plaintext connections.
-    #[cfg(feature = "http2")]
-    pub fn tcp_auto_h2c(
-        self,
-    ) -> impl ServiceFactory<
-        TcpStream,
-        Config = (),
-        Response = (),
-        Error = DispatchError,
-        InitError = (),
-    > {
-        fn_service(move |io: TcpStream| async move {
-            // subset of HTTP/2 preface defined by RFC 9113 §3.4
-            // this subset was chosen to maximize likelihood that peeking only once will allow us to
-            // reliably determine version or else it should fallback to h1 and fail quickly if data
-            // on the wire is junk
-            const H2_PREFACE: &[u8] = b"PRI * HTTP/2";
-
-            let mut buf = [0; 12];
-
-            io.peek(&mut buf).await?;
-
-            let proto = if buf == H2_PREFACE {
-                Protocol::Http2
-            } else {
-                Protocol::Http1
-            };
-
-            let peer_addr = io.peer_addr().ok();
-            Ok((io, proto, peer_addr))
-        })
-        .and_then(self)
-    }
 }
 
 /// Configuration options used when accepting TLS connection.
 #[cfg(any(feature = "openssl", feature = "rustls"))]
+#[cfg_attr(docsrs, doc(cfg(any(feature = "openssl", feature = "rustls"))))]
 #[derive(Debug, Default)]
 pub struct TlsAcceptorConfig {
     pub(crate) handshake_timeout: Option<std::time::Duration>,

actix-http/src/ws/codec.rs

@@ -1,7 +1,7 @@
+use actix_codec::{Decoder, Encoder};
 use bitflags::bitflags;
 use bytes::{Bytes, BytesMut};
 use bytestring::ByteString;
-use tokio_util::codec::{Decoder, Encoder};
 use tracing::error;
 
 use super::{
@@ -11,7 +11,7 @@ use super::{
 };
 
 /// A WebSocket message.
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq)]
 pub enum Message {
     /// Text message.
     Text(ByteString),
@@ -36,7 +36,7 @@ pub enum Message {
 }
 
 /// A WebSocket frame.
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq)]
 pub enum Frame {
     /// Text frame. Note that the codec does not validate UTF-8 encoding.
     Text(Bytes),
@@ -58,7 +58,7 @@ pub enum Frame {
 }
 
 /// A WebSocket continuation item.
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq)]
 pub enum Item {
     FirstText(Bytes),
     FirstBinary(Bytes),

actix-http/src/ws/dispatcher.rs

@@ -76,9 +76,7 @@ mod inner {
     use pin_project_lite::pin_project;
     use tracing::debug;
 
-    use actix_codec::Framed;
-    use tokio::io::{AsyncRead, AsyncWrite};
-    use tokio_util::codec::{Decoder, Encoder};
+    use actix_codec::{AsyncRead, AsyncWrite, Decoder, Encoder, Framed};
 
     use crate::{body::BoxBody, Response};
 

actix-http/src/ws/frame.rs

@@ -313,7 +313,7 @@ mod tests {
     #[test]
     fn test_parse_frame_no_mask() {
         let mut buf = BytesMut::from(&[0b0000_0001u8, 0b0000_0001u8][..]);
-        buf.extend([1u8]);
+        buf.extend(&[1u8]);
 
         assert!(Parser::parse(&mut buf, true, 1024).is_err());
 
@@ -326,7 +326,7 @@ mod tests {
     #[test]
     fn test_parse_frame_max_size() {
         let mut buf = BytesMut::from(&[0b0000_0001u8, 0b0000_0010u8][..]);
-        buf.extend([1u8, 1u8]);
+        buf.extend(&[1u8, 1u8]);
 
         assert!(Parser::parse(&mut buf, true, 1).is_err());
 
@@ -340,9 +340,9 @@ mod tests {
     fn test_parse_frame_max_size_recoverability() {
         let mut buf = BytesMut::new();
         // The first text frame with length == 2, payload doesn't matter.
-        buf.extend([0b0000_0001u8, 0b0000_0010u8, 0b0000_0000u8, 0b0000_0000u8]);
+        buf.extend(&[0b0000_0001u8, 0b0000_0010u8, 0b0000_0000u8, 0b0000_0000u8]);
         // Next binary frame with length == 2 and payload == `[0x1111_1111u8, 0x1111_1111u8]`.
-        buf.extend([0b0000_0010u8, 0b0000_0010u8, 0b1111_1111u8, 0b1111_1111u8]);
+        buf.extend(&[0b0000_0010u8, 0b0000_0010u8, 0b1111_1111u8, 0b1111_1111u8]);
 
         assert_eq!(buf.len(), 8);
         assert!(matches!(

actix-http/src/ws/mod.rs

@@ -26,39 +26,39 @@ pub use self::proto::{hash_key, CloseCode, CloseReason, OpCode};
 #[derive(Debug, Display, Error, From)]
 pub enum ProtocolError {
     /// Received an unmasked frame from client.
-    #[display(fmt = "received an unmasked frame from client")]
+    #[display(fmt = "Received an unmasked frame from client.")]
     UnmaskedFrame,
 
     /// Received a masked frame from server.
-    #[display(fmt = "received a masked frame from server")]
+    #[display(fmt = "Received a masked frame from server.")]
     MaskedFrame,
 
     /// Encountered invalid opcode.
-    #[display(fmt = "invalid opcode ({})", _0)]
+    #[display(fmt = "Invalid opcode: {}.", _0)]
     InvalidOpcode(#[error(not(source))] u8),
 
     /// Invalid control frame length
-    #[display(fmt = "invalid control frame length ({})", _0)]
+    #[display(fmt = "Invalid control frame length: {}.", _0)]
     InvalidLength(#[error(not(source))] usize),
 
     /// Bad opcode.
-    #[display(fmt = "bad opcode")]
+    #[display(fmt = "Bad opcode.")]
     BadOpCode,
 
     /// A payload reached size limit.
-    #[display(fmt = "payload reached size limit")]
+    #[display(fmt = "A payload reached size limit.")]
     Overflow,
 
-    /// Continuation has not started.
-    #[display(fmt = "continuation has not started")]
+    /// Continuation is not started.
+    #[display(fmt = "Continuation is not started.")]
     ContinuationNotStarted,
 
     /// Received new continuation but it is already started.
-    #[display(fmt = "received new continuation but it has already started")]
+    #[display(fmt = "Received new continuation but it is already started.")]
     ContinuationStarted,
 
     /// Unknown continuation fragment.
-    #[display(fmt = "unknown continuation fragment: {}", _0)]
+    #[display(fmt = "Unknown continuation fragment: {}.", _0)]
     ContinuationFragment(#[error(not(source))] OpCode),
 
     /// I/O error.
@@ -67,30 +67,30 @@ pub enum ProtocolError {
 }
 
 /// WebSocket handshake errors
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Display, Error)]
+#[derive(Debug, Clone, Copy, PartialEq, Display, Error)]
 pub enum HandshakeError {
     /// Only get method is allowed.
-    #[display(fmt = "method not allowed")]
+    #[display(fmt = "Method not allowed.")]
     GetMethodRequired,
 
     /// Upgrade header if not set to WebSocket.
-    #[display(fmt = "WebSocket upgrade is expected")]
+    #[display(fmt = "WebSocket upgrade is expected.")]
     NoWebsocketUpgrade,
 
     /// Connection header is not set to upgrade.
-    #[display(fmt = "connection upgrade is expected")]
+    #[display(fmt = "Connection upgrade is expected.")]
     NoConnectionUpgrade,
 
     /// WebSocket version header is not set.
-    #[display(fmt = "WebSocket version header is required")]
+    #[display(fmt = "WebSocket version header is required.")]
     NoVersionHeader,
 
     /// Unsupported WebSocket version.
-    #[display(fmt = "unsupported WebSocket version")]
+    #[display(fmt = "Unsupported WebSocket version.")]
     UnsupportedVersion,
 
     /// WebSocket key is not set or wrong.
-    #[display(fmt = "unknown WebSocket key")]
+    #[display(fmt = "Unknown websocket key.")]
     BadWebsocketKey,
 }
 

actix-http/src/ws/proto.rs

@@ -3,7 +3,6 @@ use std::{
     fmt,
 };
 
-use base64::prelude::*;
 use tracing::error;
 
 /// Operation codes defined in [RFC 6455 §11.8].
@@ -245,7 +244,7 @@ pub fn hash_key(key: &[u8]) -> [u8; 28] {
     };
 
     let mut hash_b64 = [0; 28];
-    let n = BASE64_STANDARD.encode_slice(hash, &mut hash_b64).unwrap();
+    let n = base64::encode_config_slice(&hash, base64::STANDARD, &mut hash_b64);
     assert_eq!(n, 28);
 
     hash_b64

actix-http/tests/test_openssl.rs

@@ -1,5 +1,4 @@
 #![cfg(feature = "openssl")]
-#![allow(clippy::uninlined_format_args)]
 
 extern crate tls_openssl as openssl;
 
@@ -17,7 +16,7 @@ use actix_utils::future::{err, ok, ready};
 use bytes::{Bytes, BytesMut};
 use derive_more::{Display, Error};
 use futures_core::Stream;
-use futures_util::{stream::once, StreamExt as _};
+use futures_util::stream::{once, StreamExt as _};
 use openssl::{
     pkey::PKey,
     ssl::{SslAcceptor, SslMethod},

actix-http/tests/test_rustls.rs

@@ -1,5 +1,4 @@
 #![cfg(feature = "rustls")]
-#![allow(clippy::uninlined_format_args)]
 
 extern crate tls_rustls as rustls;
 
@@ -42,7 +41,7 @@ where
         let body = stream.as_mut();
 
         match ready!(body.poll_next(cx)) {
-            Some(Ok(bytes)) => buf.extend_from_slice(&bytes),
+            Some(Ok(bytes)) => buf.extend_from_slice(&*bytes),
             None => return Poll::Ready(Ok(())),
             Some(Err(err)) => return Poll::Ready(Err(err)),
         }

actix-http/tests/test_server.rs

@@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 use std::{
     convert::Infallible,
     io::{Read, Write},
@@ -9,15 +7,18 @@ use std::{
 
 use actix_http::{
     body::{self, BodyStream, BoxBody, SizedStream},
-    header, Error, HttpService, KeepAlive, Request, Response, StatusCode, Version,
+    header, Error, HttpService, KeepAlive, Request, Response, StatusCode,
 };
 use actix_http_test::test_server;
-use actix_rt::{net::TcpStream, time::sleep};
+use actix_rt::time::sleep;
 use actix_service::fn_service;
 use actix_utils::future::{err, ok, ready};
 use bytes::Bytes;
 use derive_more::{Display, Error};
-use futures_util::{stream::once, FutureExt as _, StreamExt as _};
+use futures_util::{
+    stream::{once, StreamExt as _},
+    FutureExt as _,
+};
 use regex::Regex;
 
 #[actix_rt::test]
@@ -857,44 +858,3 @@ async fn not_modified_spec_h1() {
 
     srv.stop().await;
 }
-
-#[actix_rt::test]
-async fn h2c_auto() {
-    let mut srv = test_server(|| {
-        HttpService::build()
-            .keep_alive(KeepAlive::Disabled)
-            .finish(|req: Request| {
-                let body = match req.version() {
-                    Version::HTTP_11 => "h1",
-                    Version::HTTP_2 => "h2",
-                    _ => unreachable!(),
-                };
-                ok::<_, Infallible>(Response::ok().set_body(body))
-            })
-            .tcp_auto_h2c()
-    })
-    .await;
-
-    let req = srv.get("/");
-    assert_eq!(req.get_version(), &Version::HTTP_11);
-    let mut res = req.send().await.unwrap();
-    assert!(res.status().is_success());
-    assert_eq!(res.body().await.unwrap(), &b"h1"[..]);
-
-    // awc doesn't support forcing the version to http/2 so use h2 manually
-
-    let tcp = TcpStream::connect(srv.addr()).await.unwrap();
-    let (h2, connection) = h2::client::handshake(tcp).await.unwrap();
-    tokio::spawn(async move { connection.await.unwrap() });
-    let mut h2 = h2.ready().await.unwrap();
-
-    let request = ::http::Request::new(());
-    let (response, _) = h2.send_request(request, true).unwrap();
-    let (head, mut body) = response.await.unwrap().into_parts();
-    let body = body.data().await.unwrap().unwrap();
-
-    assert!(head.status.is_success());
-    assert_eq!(body, &b"h2"[..]);
-
-    srv.stop().await;
-}

actix-http/tests/test_ws.rs

@@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 use std::{
     cell::Cell,
     convert::Infallible,
@@ -39,13 +37,13 @@ impl WsService {
 
 #[derive(Debug, Display, Error, From)]
 enum WsServiceError {
-    #[display(fmt = "HTTP error")]
+    #[display(fmt = "http error")]
     Http(actix_http::Error),
 
-    #[display(fmt = "WS handshake error")]
+    #[display(fmt = "ws handshake error")]
     Ws(actix_http::ws::HandshakeError),
 
-    #[display(fmt = "I/O error")]
+    #[display(fmt = "io error")]
     Io(std::io::Error),
 
     #[display(fmt = "dispatcher error")]

actix-multipart-derive/CHANGES.md

@@ -1,5 +0,0 @@
-# Changes
-
-## 0.6.0 - 2023-02-26
-
-- Add `MultipartForm` derive macro.

actix-multipart-derive/Cargo.toml

@@ -1,30 +0,0 @@
-[package]
-name = "actix-multipart-derive"
-version = "0.6.0"
-authors = ["Jacob Halsey <jacob@jhalsey.com>"]
-description = "Multipart form derive macro for Actix Web"
-keywords = ["http", "web", "framework", "async", "futures"]
-homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-web.git"
-license = "MIT OR Apache-2.0"
-edition = "2018"
-
-[package.metadata.docs.rs]
-rustdoc-args = ["--cfg", "docsrs"]
-all-features = true
-
-[lib]
-proc-macro = true
-
-[dependencies]
-darling = "0.14"
-parse-size = "1"
-proc-macro2 = "1"
-quote = "1"
-syn = "1"
-
-[dev-dependencies]
-actix-multipart = "0.6"
-actix-web = "4"
-rustversion = "1"
-trybuild = "1"

actix-multipart-derive/LICENSE-APACHE

@@ -1 +0,0 @@
-../LICENSE-APACHE

actix-multipart-derive/LICENSE-MIT

@@ -1 +0,0 @@
-../LICENSE-MIT

actix-multipart-derive/README.md

@@ -1,17 +0,0 @@
-# actix-multipart-derive
-
-> The derive macro implementation for actix-multipart-derive.
-
-[![crates.io](https://img.shields.io/crates/v/actix-multipart-derive?label=latest)](https://crates.io/crates/actix-multipart-derive)
-[![Documentation](https://docs.rs/actix-multipart-derive/badge.svg?version=0.5.0)](https://docs.rs/actix-multipart-derive/0.5.0)
-![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
-![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-multipart-derive.svg)
-<br />
-[![dependency status](https://deps.rs/crate/actix-multipart-derive/0.5.0/status.svg)](https://deps.rs/crate/actix-multipart-derive/0.5.0)
-[![Download](https://img.shields.io/crates/d/actix-multipart-derive.svg)](https://crates.io/crates/actix-multipart-derive)
-[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
-
-## Documentation & Resources
-
-- [API Documentation](https://docs.rs/actix-multipart-derive)
-- Minimum Supported Rust Version (MSRV): 1.59

actix-multipart-derive/src/lib.rs

@@ -1,315 +0,0 @@
-//! Multipart form derive macro for Actix Web.
-//!
-//! See [`macro@MultipartForm`] for usage examples.
-
-#![deny(rust_2018_idioms, nonstandard_style)]
-#![warn(future_incompatible)]
-#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
-#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
-
-use std::{collections::HashSet, convert::TryFrom as _};
-
-use darling::{FromDeriveInput, FromField, FromMeta};
-use parse_size::parse_size;
-use proc_macro::TokenStream;
-use proc_macro2::Ident;
-use quote::quote;
-use syn::{parse_macro_input, Type};
-
-#[derive(FromMeta)]
-enum DuplicateField {
-    Ignore,
-    Deny,
-    Replace,
-}
-
-impl Default for DuplicateField {
-    fn default() -> Self {
-        Self::Ignore
-    }
-}
-
-#[derive(FromDeriveInput, Default)]
-#[darling(attributes(multipart), default)]
-struct MultipartFormAttrs {
-    deny_unknown_fields: bool,
-    duplicate_field: DuplicateField,
-}
-
-#[derive(FromField, Default)]
-#[darling(attributes(multipart), default)]
-struct FieldAttrs {
-    rename: Option<String>,
-    limit: Option<String>,
-}
-
-struct ParsedField<'t> {
-    serialization_name: String,
-    rust_name: &'t Ident,
-    limit: Option<usize>,
-    ty: &'t Type,
-}
-
-/// Implements `MultipartCollect` for a struct so that it can be used with the `MultipartForm`
-/// extractor.
-///
-/// # Basic Use
-///
-/// Each field type should implement the `FieldReader` trait:
-///
-/// ```
-/// use actix_multipart::form::{tempfile::TempFile, text::Text, MultipartForm};
-///
-/// #[derive(MultipartForm)]
-/// struct ImageUpload {
-///     description: Text<String>,
-///     timestamp: Text<i64>,
-///     image: TempFile,
-/// }
-/// ```
-///
-/// # Optional and List Fields
-///
-/// You can also use `Vec<T>` and `Option<T>` provided that `T: FieldReader`.
-///
-/// A [`Vec`] field corresponds to an upload with multiple parts under the [same field
-/// name](https://www.rfc-editor.org/rfc/rfc7578#section-4.3).
-///
-/// ```
-/// use actix_multipart::form::{tempfile::TempFile, text::Text, MultipartForm};
-///
-/// #[derive(MultipartForm)]
-/// struct Form {
-///     category: Option<Text<String>>,
-///     files: Vec<TempFile>,
-/// }
-/// ```
-///
-/// # Field Renaming
-///
-/// You can use the `#[multipart(rename = "foo")]` attribute to receive a field by a different name.
-///
-/// ```
-/// use actix_multipart::form::{tempfile::TempFile, MultipartForm};
-///
-/// #[derive(MultipartForm)]
-/// struct Form {
-///     #[multipart(rename = "files[]")]
-///     files: Vec<TempFile>,
-/// }
-/// ```
-///
-/// # Field Limits
-///
-/// You can use the `#[multipart(limit = "<size>")]` attribute to set field level limits. The limit
-/// string is parsed using [parse_size].
-///
-/// Note: the form is also subject to the global limits configured using `MultipartFormConfig`.
-///
-/// ```
-/// use actix_multipart::form::{tempfile::TempFile, text::Text, MultipartForm};
-///
-/// #[derive(MultipartForm)]
-/// struct Form {
-///     #[multipart(limit = "2 KiB")]
-///     description: Text<String>,
-///
-///     #[multipart(limit = "512 MiB")]
-///     files: Vec<TempFile>,
-/// }
-/// ```
-///
-/// # Unknown Fields
-///
-/// By default fields with an unknown name are ignored. They can be rejected using the
-/// `#[multipart(deny_unknown_fields)]` attribute:
-///
-/// ```
-/// # use actix_multipart::form::MultipartForm;
-/// #[derive(MultipartForm)]
-/// #[multipart(deny_unknown_fields)]
-/// struct Form { }
-/// ```
-///
-/// # Duplicate Fields
-///
-/// The behaviour for when multiple fields with the same name are received can be changed using the
-/// `#[multipart(duplicate_field = "<behavior>")]` attribute:
-///
-/// - "ignore": (default) Extra fields are ignored. I.e., the first one is persisted.
-/// - "deny": A `MultipartError::UnsupportedField` error response is returned.
-/// - "replace": Each field is processed, but only the last one is persisted.
-///
-/// Note that `Vec` fields will ignore this option.
-///
-/// ```
-/// # use actix_multipart::form::MultipartForm;
-/// #[derive(MultipartForm)]
-/// #[multipart(duplicate_field = "deny")]
-/// struct Form { }
-/// ```
-///
-/// [parse_size]: https://docs.rs/parse-size/1/parse_size
-#[proc_macro_derive(MultipartForm, attributes(multipart))]
-pub fn impl_multipart_form(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let input: syn::DeriveInput = parse_macro_input!(input);
-
-    let name = &input.ident;
-
-    let data_struct = match &input.data {
-        syn::Data::Struct(data_struct) => data_struct,
-        _ => {
-            return compile_err(syn::Error::new(
-                input.ident.span(),
-                "`MultipartForm` can only be derived for structs",
-            ))
-        }
-    };
-
-    let fields = match &data_struct.fields {
-        syn::Fields::Named(fields_named) => fields_named,
-        _ => {
-            return compile_err(syn::Error::new(
-                input.ident.span(),
-                "`MultipartForm` can only be derived for a struct with named fields",
-            ))
-        }
-    };
-
-    let attrs = match MultipartFormAttrs::from_derive_input(&input) {
-        Ok(attrs) => attrs,
-        Err(err) => return err.write_errors().into(),
-    };
-
-    // Parse the field attributes
-    let parsed = match fields
-        .named
-        .iter()
-        .map(|field| {
-            let rust_name = field.ident.as_ref().unwrap();
-            let attrs = FieldAttrs::from_field(field).map_err(|err| err.write_errors())?;
-            let serialization_name = attrs.rename.unwrap_or_else(|| rust_name.to_string());
-
-            let limit = match attrs.limit.map(|limit| match parse_size(&limit) {
-                Ok(size) => Ok(usize::try_from(size).unwrap()),
-                Err(err) => Err(syn::Error::new(
-                    field.ident.as_ref().unwrap().span(),
-                    format!("Could not parse size limit `{}`: {}", limit, err),
-                )),
-            }) {
-                Some(Err(err)) => return Err(compile_err(err)),
-                limit => limit.map(Result::unwrap),
-            };
-
-            Ok(ParsedField {
-                serialization_name,
-                rust_name,
-                limit,
-                ty: &field.ty,
-            })
-        })
-        .collect::<Result<Vec<_>, TokenStream>>()
-    {
-        Ok(attrs) => attrs,
-        Err(err) => return err,
-    };
-
-    // Check that field names are unique
-    let mut set = HashSet::new();
-    for field in &parsed {
-        if !set.insert(field.serialization_name.clone()) {
-            return compile_err(syn::Error::new(
-                field.rust_name.span(),
-                format!("Multiple fields named: `{}`", field.serialization_name),
-            ));
-        }
-    }
-
-    // Return value when a field name is not supported by the form
-    let unknown_field_result = if attrs.deny_unknown_fields {
-        quote!(::std::result::Result::Err(
-            ::actix_multipart::MultipartError::UnsupportedField(field.name().to_string())
-        ))
-    } else {
-        quote!(::std::result::Result::Ok(()))
-    };
-
-    // Value for duplicate action
-    let duplicate_field = match attrs.duplicate_field {
-        DuplicateField::Ignore => quote!(::actix_multipart::form::DuplicateField::Ignore),
-        DuplicateField::Deny => quote!(::actix_multipart::form::DuplicateField::Deny),
-        DuplicateField::Replace => quote!(::actix_multipart::form::DuplicateField::Replace),
-    };
-
-    // limit() implementation
-    let mut limit_impl = quote!();
-    for field in &parsed {
-        let name = &field.serialization_name;
-        if let Some(value) = field.limit {
-            limit_impl.extend(quote!(
-                #name => ::std::option::Option::Some(#value),
-            ));
-        }
-    }
-
-    // handle_field() implementation
-    let mut handle_field_impl = quote!();
-    for field in &parsed {
-        let name = &field.serialization_name;
-        let ty = &field.ty;
-
-        handle_field_impl.extend(quote!(
-            #name => ::std::boxed::Box::pin(
-                <#ty as ::actix_multipart::form::FieldGroupReader>::handle_field(req, field, limits, state, #duplicate_field)
-            ),
-        ));
-    }
-
-    // from_state() implementation
-    let mut from_state_impl = quote!();
-    for field in &parsed {
-        let name = &field.serialization_name;
-        let rust_name = &field.rust_name;
-        let ty = &field.ty;
-        from_state_impl.extend(quote!(
-            #rust_name: <#ty as ::actix_multipart::form::FieldGroupReader>::from_state(#name, &mut state)?,
-        ));
-    }
-
-    let gen = quote! {
-        impl ::actix_multipart::form::MultipartCollect for #name {
-            fn limit(field_name: &str) -> ::std::option::Option<usize> {
-                match field_name {
-                    #limit_impl
-                    _ => None,
-                }
-            }
-
-            fn handle_field<'t>(
-                req: &'t ::actix_web::HttpRequest,
-                field: ::actix_multipart::Field,
-                limits: &'t mut ::actix_multipart::form::Limits,
-                state: &'t mut ::actix_multipart::form::State,
-            ) -> ::std::pin::Pin<::std::boxed::Box<dyn ::std::future::Future<Output = ::std::result::Result<(), ::actix_multipart::MultipartError>> + 't>> {
-                match field.name() {
-                    #handle_field_impl
-                    _ => return ::std::boxed::Box::pin(::std::future::ready(#unknown_field_result)),
-                }
-            }
-
-            fn from_state(mut state: ::actix_multipart::form::State) -> ::std::result::Result<Self, ::actix_multipart::MultipartError> {
-                Ok(Self {
-                    #from_state_impl
-                })
-            }
-
-        }
-    };
-    gen.into()
-}
-
-/// Transform a syn error into a token stream for returning.
-fn compile_err(err: syn::Error) -> TokenStream {
-    TokenStream::from(err.to_compile_error())
-}

actix-multipart-derive/tests/trybuild.rs

@@ -1,16 +0,0 @@
-#[rustversion::stable(1.59)] // MSRV
-#[test]
-fn compile_macros() {
-    let t = trybuild::TestCases::new();
-
-    t.pass("tests/trybuild/all-required.rs");
-    t.pass("tests/trybuild/optional-and-list.rs");
-    t.pass("tests/trybuild/rename.rs");
-    t.pass("tests/trybuild/deny-unknown.rs");
-
-    t.pass("tests/trybuild/deny-duplicates.rs");
-    t.compile_fail("tests/trybuild/deny-parse-fail.rs");
-
-    t.pass("tests/trybuild/size-limits.rs");
-    t.compile_fail("tests/trybuild/size-limit-parse-fail.rs");
-}

actix-multipart-derive/tests/trybuild/all-required.rs

@@ -1,19 +0,0 @@
-use actix_web::{web, App, Responder};
-
-use actix_multipart::form::{tempfile::TempFile, text::Text, MultipartForm};
-
-#[derive(Debug, MultipartForm)]
-struct ImageUpload {
-    description: Text<String>,
-    timestamp: Text<i64>,
-    image: TempFile,
-}
-
-async fn handler(_form: MultipartForm<ImageUpload>) -> impl Responder {
-    "Hello World!"
-}
-
-#[actix_web::main]
-async fn main() {
-    App::new().default_service(web::to(handler));
-}

actix-multipart-derive/tests/trybuild/deny-duplicates.rs

@@ -1,16 +0,0 @@
-use actix_web::{web, App, Responder};
-
-use actix_multipart::form::MultipartForm;
-
-#[derive(MultipartForm)]
-#[multipart(duplicate_field = "deny")]
-struct Form {}
-
-async fn handler(_form: MultipartForm<Form>) -> impl Responder {
-    "Hello World!"
-}
-
-#[actix_web::main]
-async fn main() {
-    App::new().default_service(web::to(handler));
-}

actix-multipart-derive/tests/trybuild/deny-parse-fail.rs

@@ -1,7 +0,0 @@
-use actix_multipart::form::MultipartForm;
-
-#[derive(MultipartForm)]
-#[multipart(duplicate_field = "no")]
-struct Form {}
-
-fn main() {}

actix-multipart-derive/tests/trybuild/deny-parse-fail.stderr

@@ -1,5 +0,0 @@
-error: Unknown literal value `no`
- --> tests/trybuild/deny-parse-fail.rs:4:31
-  |
-4 | #[multipart(duplicate_field = "no")]
-  |                               ^^^^

actix-multipart-derive/tests/trybuild/deny-unknown.rs

@@ -1,16 +0,0 @@
-use actix_web::{web, App, Responder};
-
-use actix_multipart::form::MultipartForm;
-
-#[derive(MultipartForm)]
-#[multipart(deny_unknown_fields)]
-struct Form {}
-
-async fn handler(_form: MultipartForm<Form>) -> impl Responder {
-    "Hello World!"
-}
-
-#[actix_web::main]
-async fn main() {
-    App::new().default_service(web::to(handler));
-}

actix-multipart-derive/tests/trybuild/optional-and-list.rs

@@ -1,18 +0,0 @@
-use actix_web::{web, App, Responder};
-
-use actix_multipart::form::{tempfile::TempFile, text::Text, MultipartForm};
-
-#[derive(MultipartForm)]
-struct Form {
-    category: Option<Text<String>>,
-    files: Vec<TempFile>,
-}
-
-async fn handler(_form: MultipartForm<Form>) -> impl Responder {
-    "Hello World!"
-}
-
-#[actix_web::main]
-async fn main() {
-    App::new().default_service(web::to(handler));
-}

actix-multipart-derive/tests/trybuild/rename.rs

@@ -1,18 +0,0 @@
-use actix_web::{web, App, Responder};
-
-use actix_multipart::form::{tempfile::TempFile, MultipartForm};
-
-#[derive(MultipartForm)]
-struct Form {
-    #[multipart(rename = "files[]")]
-    files: Vec<TempFile>,
-}
-
-async fn handler(_form: MultipartForm<Form>) -> impl Responder {
-    "Hello World!"
-}
-
-#[actix_web::main]
-async fn main() {
-    App::new().default_service(web::to(handler));
-}

actix-multipart-derive/tests/trybuild/size-limit-parse-fail.rs

@@ -1,21 +0,0 @@
-use actix_multipart::form::{text::Text, MultipartForm};
-
-#[derive(MultipartForm)]
-struct Form {
-    #[multipart(limit = "2 bytes")]
-    description: Text<String>,
-}
-
-#[derive(MultipartForm)]
-struct Form2 {
-    #[multipart(limit = "2 megabytes")]
-    description: Text<String>,
-}
-
-#[derive(MultipartForm)]
-struct Form3 {
-    #[multipart(limit = "four meters")]
-    description: Text<String>,
-}
-
-fn main() {}

actix-multipart-derive/tests/trybuild/size-limit-parse-fail.stderr

@@ -1,17 +0,0 @@
-error: Could not parse size limit `2 bytes`: invalid digit found in string
- --> tests/trybuild/size-limit-parse-fail.rs:6:5
-  |
-6 |     description: Text<String>,
-  |     ^^^^^^^^^^^
-
-error: Could not parse size limit `2 megabytes`: invalid digit found in string
-  --> tests/trybuild/size-limit-parse-fail.rs:12:5
-   |
-12 |     description: Text<String>,
-   |     ^^^^^^^^^^^
-
-error: Could not parse size limit `four meters`: invalid digit found in string
-  --> tests/trybuild/size-limit-parse-fail.rs:18:5
-   |
-18 |     description: Text<String>,
-   |     ^^^^^^^^^^^

actix-multipart-derive/tests/trybuild/size-limits.rs

@@ -1,21 +0,0 @@
-use actix_web::{web, App, Responder};
-
-use actix_multipart::form::{tempfile::TempFile, text::Text, MultipartForm};
-
-#[derive(MultipartForm)]
-struct Form {
-    #[multipart(limit = "2 KiB")]
-    description: Text<String>,
-
-    #[multipart(limit = "512 MiB")]
-    files: Vec<TempFile>,
-}
-
-async fn handler(_form: MultipartForm<Form>) -> impl Responder {
-    "Hello World!"
-}
-
-#[actix_web::main]
-async fn main() {
-    App::new().default_service(web::to(handler));
-}

actix-multipart/CHANGES.md

@@ -1,48 +1,36 @@
 # Changes
 
-## Unreleased - 2023-xx-xx
+## Unreleased - 2022-xx-xx
+- Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency.
 
-## 0.6.0 - 2023-02-26
-
-- Added `MultipartForm` typed data extractor. [#2883]
-
-[#2883]: https://github.com/actix/actix-web/pull/2883
-
-## 0.5.0 - 2023-01-21
-
-- `Field::content_type()` now returns `Option<&mime::Mime>`. [#2885]
-- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
-
-[#2885]: https://github.com/actix/actix-web/pull/2885
 
 ## 0.4.0 - 2022-02-25
-
 - No significant changes since `0.4.0-beta.13`.
 
-## 0.4.0-beta.13 - 2022-01-31
 
+## 0.4.0-beta.13 - 2022-01-31
 - No significant changes since `0.4.0-beta.12`.
 
-## 0.4.0-beta.12 - 2022-01-04
 
+## 0.4.0-beta.12 - 2022-01-04
 - Minimum supported Rust version (MSRV) is now 1.54.
 
-## 0.4.0-beta.11 - 2021-12-27
 
+## 0.4.0-beta.11 - 2021-12-27
 - No significant changes since `0.4.0-beta.10`.
 
-## 0.4.0-beta.10 - 2021-12-11
 
+## 0.4.0-beta.10 - 2021-12-11
 - No significant changes since `0.4.0-beta.9`.
 
-## 0.4.0-beta.9 - 2021-12-01
 
+## 0.4.0-beta.9 - 2021-12-01
 - Polling `Field` after dropping `Multipart` now fails immediately instead of hanging forever. [#2463]
 
 [#2463]: https://github.com/actix/actix-web/pull/2463
 
-## 0.4.0-beta.8 - 2021-11-22
 
+## 0.4.0-beta.8 - 2021-11-22
 - Ensure a correct Content-Disposition header is included in every part of a multipart message. [#2451]
 - Added `MultipartError::NoContentDisposition` variant. [#2451]
 - Since Content-Disposition is now ensured, `Field::content_disposition` is now infallible. [#2451]
@@ -52,52 +40,52 @@
 
 [#2451]: https://github.com/actix/actix-web/pull/2451
 
-## 0.4.0-beta.7 - 2021-10-20
 
+## 0.4.0-beta.7 - 2021-10-20
 - Minimum supported Rust version (MSRV) is now 1.52.
 
-## 0.4.0-beta.6 - 2021-09-09
 
+## 0.4.0-beta.6 - 2021-09-09
 - Minimum supported Rust version (MSRV) is now 1.51.
 
-## 0.4.0-beta.5 - 2021-06-17
 
+## 0.4.0-beta.5 - 2021-06-17
 - No notable changes.
 
+
 ## 0.4.0-beta.4 - 2021-04-02
-
 - No notable changes.
 
+
 ## 0.4.0-beta.3 - 2021-03-09
-
 - No notable changes.
 
+
 ## 0.4.0-beta.2 - 2021-02-10
-
 - No notable changes.
 
-## 0.4.0-beta.1 - 2021-01-07
 
+## 0.4.0-beta.1 - 2021-01-07
 - Fix multipart consuming payload before header checks. [#1513]
 - Update `bytes` to `1.0`. [#1813]
 
 [#1813]: https://github.com/actix/actix-web/pull/1813
 [#1513]: https://github.com/actix/actix-web/pull/1513
 
-## 0.3.0 - 2020-09-11
 
+## 0.3.0 - 2020-09-11
 - No significant changes from `0.3.0-beta.2`.
 
-## 0.3.0-beta.2 - 2020-09-10
 
+## 0.3.0-beta.2 - 2020-09-10
 - Update `actix-*` dependencies to latest versions.
 
-## 0.3.0-beta.1 - 2020-07-15
 
+## 0.3.0-beta.1 - 2020-07-15
 - Update `actix-web` to 3.0.0-beta.1
 
-## 0.3.0-alpha.1 - 2020-05-25
 
+## 0.3.0-alpha.1 - 2020-05-25
 - Update `actix-web` to 3.0.0-alpha.3
 - Bump minimum supported Rust version to 1.40
 - Minimize `futures` dependencies

actix-multipart/Cargo.toml

@@ -1,10 +1,7 @@
 [package]
 name = "actix-multipart"
-version = "0.6.0"
-authors = [
-    "Nikolay Kim <fafhrd91@gmail.com>",
-    "Jacob Halsey <jacob@jhalsey.com>",
-]
+version = "0.4.0"
+authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Multipart form support for Actix Web"
 keywords = ["http", "web", "framework", "async", "futures"]
 homepage = "https://actix.rs"
@@ -12,42 +9,26 @@ repository = "https://github.com/actix/actix-web.git"
 license = "MIT OR Apache-2.0"
 edition = "2018"
 
-[package.metadata.docs.rs]
-rustdoc-args = ["--cfg", "docsrs"]
-all-features = true
-
-[features]
-default = ["tempfile", "derive"]
-derive = ["actix-multipart-derive"]
-tempfile = ["tempfile-dep", "tokio/fs"]
+[lib]
+name = "actix_multipart"
+path = "src/lib.rs"
 
 [dependencies]
-actix-multipart-derive = { version = "=0.6.0", optional = true }
 actix-utils = "3"
 actix-web = { version = "4", default-features = false }
 
 bytes = "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"] }
+futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
 httparse = "1.3"
 local-waker = "0.1"
 log = "0.4"
-memchr = "2.5"
 mime = "0.3"
-serde = "1"
-serde_json = "1"
-serde_plain = "1"
-# TODO(MSRV 1.60): replace with dep: prefix
-tempfile-dep = { package = "tempfile", version = "3.4", optional = true }
-tokio = { version = "1.24.2", features = ["sync"] }
+twoway = "0.2"
 
 [dev-dependencies]
-actix-http = "3"
-actix-multipart-rfc7578 = "0.10"
 actix-rt = "2.2"
-actix-test = "0.1"
-awc = "3"
-futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
-tokio = { version = "1.24.2", features = ["sync"] }
+actix-http = "3.0.0"
+futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
+tokio = { version = "1.8.4", features = ["sync"] }
 tokio-stream = "0.1"

actix-multipart/README.md

@@ -3,15 +3,15 @@
 > Multipart form support for Actix Web.
 
 [![crates.io](https://img.shields.io/crates/v/actix-multipart?label=latest)](https://crates.io/crates/actix-multipart)
-[![Documentation](https://docs.rs/actix-multipart/badge.svg?version=0.6.0)](https://docs.rs/actix-multipart/0.6.0)
-![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
+[![Documentation](https://docs.rs/actix-multipart/badge.svg?version=0.4.0)](https://docs.rs/actix-multipart/0.4.0)
+![Version](https://img.shields.io/badge/rustc-1.57+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-multipart.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-multipart/0.6.0/status.svg)](https://deps.rs/crate/actix-multipart/0.6.0)
+[![dependency status](https://deps.rs/crate/actix-multipart/0.4.0/status.svg)](https://deps.rs/crate/actix-multipart/0.4.0)
 [![Download](https://img.shields.io/crates/d/actix-multipart.svg)](https://crates.io/crates/actix-multipart)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
 ## Documentation & Resources
 
 - [API Documentation](https://docs.rs/actix-multipart)
-- Minimum Supported Rust Version (MSRV): 1.59
+- Minimum Supported Rust Version (MSRV): 1.54

actix-multipart/src/error.rs

@@ -1,15 +1,12 @@
 //! Error and Result module
-
-use actix_web::{
-    error::{ParseError, PayloadError},
-    http::StatusCode,
-    ResponseError,
-};
+use actix_web::error::{ParseError, PayloadError};
+use actix_web::http::StatusCode;
+use actix_web::ResponseError;
 use derive_more::{Display, Error, From};
 
-/// A set of errors that can occur during parsing multipart streams.
-#[derive(Debug, Display, From, Error)]
+/// A set of errors that can occur during parsing multipart streams
 #[non_exhaustive]
+#[derive(Debug, Display, From, Error)]
 pub enum MultipartError {
     /// Content-Disposition header is not found or is not equal to "form-data".
     ///
@@ -49,41 +46,12 @@ pub enum MultipartError {
     /// Not consumed
     #[display(fmt = "Multipart stream is not consumed")]
     NotConsumed,
-
-    /// An error from a field handler in a form
-    #[display(
-        fmt = "An error occurred processing field `{}`: {}",
-        field_name,
-        source
-    )]
-    Field {
-        field_name: String,
-        source: actix_web::Error,
-    },
-
-    /// Duplicate field
-    #[display(fmt = "Duplicate field found for: `{}`", _0)]
-    #[from(ignore)]
-    DuplicateField(#[error(not(source))] String),
-
-    /// Missing field
-    #[display(fmt = "Field with name `{}` is required", _0)]
-    #[from(ignore)]
-    MissingField(#[error(not(source))] String),
-
-    /// Unknown field
-    #[display(fmt = "Unsupported field `{}`", _0)]
-    #[from(ignore)]
-    UnsupportedField(#[error(not(source))] String),
 }
 
 /// Return `BadRequest` for `MultipartError`
 impl ResponseError for MultipartError {
     fn status_code(&self) -> StatusCode {
-        match &self {
-            MultipartError::Field { source, .. } => source.as_response_error().status_code(),
-            _ => StatusCode::BAD_REQUEST,
-        }
+        StatusCode::BAD_REQUEST
     }
 }
 

actix-multipart/src/extractor.rs

@@ -9,11 +9,12 @@ use crate::server::Multipart;
 ///
 /// Content-type: multipart/form-data;
 ///
-/// # Examples
+/// ## Server example
+///
 /// ```
 /// use actix_web::{web, HttpResponse, Error};
 /// use actix_multipart::Multipart;
-/// use futures_util::StreamExt as _;
+/// use futures_util::stream::StreamExt as _;
 ///
 /// async fn index(mut payload: Multipart) -> Result<HttpResponse, Error> {
 ///     // iterate over multipart stream

actix-multipart/src/form/bytes.rs

@@ -1,53 +0,0 @@
-//! Reads a field into memory.
-
-use actix_web::HttpRequest;
-use bytes::BytesMut;
-use futures_core::future::LocalBoxFuture;
-use futures_util::TryStreamExt as _;
-use mime::Mime;
-
-use crate::{
-    form::{FieldReader, Limits},
-    Field, MultipartError,
-};
-
-/// Read the field into memory.
-#[derive(Debug)]
-pub struct Bytes {
-    /// The data.
-    pub data: bytes::Bytes,
-
-    /// The value of the `Content-Type` header.
-    pub content_type: Option<Mime>,
-
-    /// The `filename` value in the `Content-Disposition` header.
-    pub file_name: Option<String>,
-}
-
-impl<'t> FieldReader<'t> for Bytes {
-    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 {
-            let mut buf = BytesMut::with_capacity(131_072);
-
-            while let Some(chunk) = field.try_next().await? {
-                limits.try_consume_limits(chunk.len(), true)?;
-                buf.extend(chunk);
-            }
-
-            Ok(Bytes {
-                data: buf.freeze(),
-                content_type: field.content_type().map(ToOwned::to_owned),
-                file_name: field
-                    .content_disposition()
-                    .get_filename()
-                    .map(str::to_owned),
-            })
-        })
-    }
-}

actix-multipart/src/form/json.rs

@@ -1,195 +0,0 @@
-//! Deserializes a field as JSON.
-
-use std::sync::Arc;
-
-use actix_web::{http::StatusCode, web, Error, HttpRequest, ResponseError};
-use derive_more::{Deref, DerefMut, Display, Error};
-use futures_core::future::LocalBoxFuture;
-use serde::de::DeserializeOwned;
-
-use crate::{
-    form::{bytes::Bytes, FieldReader, Limits},
-    Field, MultipartError,
-};
-
-use super::FieldErrorHandler;
-
-/// Deserialize from JSON.
-#[derive(Debug, Deref, DerefMut)]
-pub struct Json<T: DeserializeOwned>(pub T);
-
-impl<T: DeserializeOwned> Json<T> {
-    pub fn into_inner(self) -> T {
-        self.0
-    }
-}
-
-impl<'t, T> FieldReader<'t> for Json<T>
-where
-    T: DeserializeOwned + 'static,
-{
-    type Future = LocalBoxFuture<'t, Result<Self, MultipartError>>;
-
-    fn read_field(req: &'t HttpRequest, field: Field, limits: &'t mut Limits) -> Self::Future {
-        Box::pin(async move {
-            let config = JsonConfig::from_req(req);
-            let field_name = field.name().to_owned();
-
-            if config.validate_content_type {
-                let valid = if let Some(mime) = field.content_type() {
-                    mime.subtype() == mime::JSON || mime.suffix() == Some(mime::JSON)
-                } else {
-                    false
-                };
-
-                if !valid {
-                    return Err(MultipartError::Field {
-                        field_name,
-                        source: config.map_error(req, JsonFieldError::ContentType),
-                    });
-                }
-            }
-
-            let bytes = Bytes::read_field(req, field, limits).await?;
-
-            Ok(Json(serde_json::from_slice(bytes.data.as_ref()).map_err(
-                |err| MultipartError::Field {
-                    field_name,
-                    source: config.map_error(req, JsonFieldError::Deserialize(err)),
-                },
-            )?))
-        })
-    }
-}
-
-#[derive(Debug, Display, Error)]
-#[non_exhaustive]
-pub enum JsonFieldError {
-    /// Deserialize error.
-    #[display(fmt = "Json deserialize error: {}", _0)]
-    Deserialize(serde_json::Error),
-
-    /// Content type error.
-    #[display(fmt = "Content type error")]
-    ContentType,
-}
-
-impl ResponseError for JsonFieldError {
-    fn status_code(&self) -> StatusCode {
-        StatusCode::BAD_REQUEST
-    }
-}
-
-/// Configuration for the [`Json`] field reader.
-#[derive(Clone)]
-pub struct JsonConfig {
-    err_handler: FieldErrorHandler<JsonFieldError>,
-    validate_content_type: bool,
-}
-
-const DEFAULT_CONFIG: JsonConfig = JsonConfig {
-    err_handler: None,
-    validate_content_type: true,
-};
-
-impl JsonConfig {
-    pub fn error_handler<F>(mut self, f: F) -> Self
-    where
-        F: Fn(JsonFieldError, &HttpRequest) -> Error + Send + Sync + 'static,
-    {
-        self.err_handler = Some(Arc::new(f));
-        self
-    }
-
-    /// Extract payload config from app data. Check both `T` and `Data<T>`, in that order, and fall
-    /// back to the default payload config.
-    fn from_req(req: &HttpRequest) -> &Self {
-        req.app_data::<Self>()
-            .or_else(|| req.app_data::<web::Data<Self>>().map(|d| d.as_ref()))
-            .unwrap_or(&DEFAULT_CONFIG)
-    }
-
-    fn map_error(&self, req: &HttpRequest, err: JsonFieldError) -> Error {
-        if let Some(err_handler) = self.err_handler.as_ref() {
-            (*err_handler)(err, req)
-        } else {
-            err.into()
-        }
-    }
-
-    /// Sets whether or not the field must have a valid `Content-Type` header to be parsed.
-    pub fn validate_content_type(mut self, validate_content_type: bool) -> Self {
-        self.validate_content_type = validate_content_type;
-        self
-    }
-}
-
-impl Default for JsonConfig {
-    fn default() -> Self {
-        DEFAULT_CONFIG
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{collections::HashMap, io::Cursor};
-
-    use actix_multipart_rfc7578::client::multipart;
-    use actix_web::{http::StatusCode, web, App, HttpResponse, Responder};
-
-    use crate::form::{
-        json::{Json, JsonConfig},
-        tests::send_form,
-        MultipartForm,
-    };
-
-    #[derive(MultipartForm)]
-    struct JsonForm {
-        json: Json<HashMap<String, String>>,
-    }
-
-    async fn test_json_route(form: MultipartForm<JsonForm>) -> impl Responder {
-        let mut expected = HashMap::new();
-        expected.insert("key1".to_owned(), "value1".to_owned());
-        expected.insert("key2".to_owned(), "value2".to_owned());
-        assert_eq!(&*form.json, &expected);
-        HttpResponse::Ok().finish()
-    }
-
-    #[actix_rt::test]
-    async fn test_json_without_content_type() {
-        let srv = actix_test::start(|| {
-            App::new()
-                .route("/", web::post().to(test_json_route))
-                .app_data(JsonConfig::default().validate_content_type(false))
-        });
-
-        let mut form = multipart::Form::default();
-        form.add_text("json", "{\"key1\": \"value1\", \"key2\": \"value2\"}");
-        let response = send_form(&srv, form, "/").await;
-        assert_eq!(response.status(), StatusCode::OK);
-    }
-
-    #[actix_rt::test]
-    async fn test_content_type_validation() {
-        let srv = actix_test::start(|| {
-            App::new()
-                .route("/", web::post().to(test_json_route))
-                .app_data(JsonConfig::default().validate_content_type(true))
-        });
-
-        // Deny because wrong content type
-        let bytes = Cursor::new("{\"key1\": \"value1\", \"key2\": \"value2\"}");
-        let mut form = multipart::Form::default();
-        form.add_reader_file_with_mime("json", bytes, "", mime::APPLICATION_OCTET_STREAM);
-        let response = send_form(&srv, form, "/").await;
-        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-
-        // Allow because correct content type
-        let bytes = Cursor::new("{\"key1\": \"value1\", \"key2\": \"value2\"}");
-        let mut form = multipart::Form::default();
-        form.add_reader_file_with_mime("json", bytes, "", mime::APPLICATION_JSON);
-        let response = send_form(&srv, form, "/").await;
-        assert_eq!(response.status(), StatusCode::OK);
-    }
-}

actix-multipart/src/form/mod.rs

@@ -1,742 +0,0 @@
-//! Process and extract typed data from a multipart stream.
-
-use std::{
-    any::Any,
-    collections::HashMap,
-    future::{ready, Future},
-    sync::Arc,
-};
-
-use actix_web::{dev, error::PayloadError, web, Error, FromRequest, HttpRequest};
-use derive_more::{Deref, DerefMut};
-use futures_core::future::LocalBoxFuture;
-use futures_util::{TryFutureExt as _, TryStreamExt as _};
-
-use crate::{Field, Multipart, MultipartError};
-
-pub mod bytes;
-pub mod json;
-#[cfg(feature = "tempfile")]
-pub mod tempfile;
-pub mod text;
-
-#[cfg(feature = "derive")]
-pub use actix_multipart_derive::MultipartForm;
-
-type FieldErrorHandler<T> = Option<Arc<dyn Fn(T, &HttpRequest) -> Error + Send + Sync>>;
-
-/// Trait that data types to be used in a multipart form struct should implement.
-///
-/// It represents an asynchronous handler that processes a multipart field to produce `Self`.
-pub trait FieldReader<'t>: Sized + Any {
-    /// Future that resolves to a `Self`.
-    type Future: Future<Output = Result<Self, MultipartError>>;
-
-    /// The form will call this function to handle the field.
-    fn read_field(req: &'t HttpRequest, field: Field, limits: &'t mut Limits) -> Self::Future;
-}
-
-/// Used to accumulate the state of the loaded fields.
-#[doc(hidden)]
-#[derive(Default, Deref, DerefMut)]
-pub struct State(pub HashMap<String, Box<dyn Any>>);
-
-/// Trait that the field collection types implement, i.e. `Vec<T>`, `Option<T>`, or `T` itself.
-#[doc(hidden)]
-pub trait FieldGroupReader<'t>: Sized + Any {
-    type Future: Future<Output = Result<(), MultipartError>>;
-
-    /// The form will call this function for each matching field.
-    fn handle_field(
-        req: &'t HttpRequest,
-        field: Field,
-        limits: &'t mut Limits,
-        state: &'t mut State,
-        duplicate_field: DuplicateField,
-    ) -> Self::Future;
-
-    /// Construct `Self` from the group of processed fields.
-    fn from_state(name: &str, state: &'t mut State) -> Result<Self, MultipartError>;
-}
-
-impl<'t, T> FieldGroupReader<'t> for Option<T>
-where
-    T: FieldReader<'t>,
-{
-    type Future = LocalBoxFuture<'t, Result<(), MultipartError>>;
-
-    fn handle_field(
-        req: &'t HttpRequest,
-        field: Field,
-        limits: &'t mut Limits,
-        state: &'t mut State,
-        duplicate_field: DuplicateField,
-    ) -> Self::Future {
-        if state.contains_key(field.name()) {
-            match duplicate_field {
-                DuplicateField::Ignore => return Box::pin(ready(Ok(()))),
-
-                DuplicateField::Deny => {
-                    return Box::pin(ready(Err(MultipartError::DuplicateField(
-                        field.name().to_owned(),
-                    ))))
-                }
-
-                DuplicateField::Replace => {}
-            }
-        }
-
-        Box::pin(async move {
-            let field_name = field.name().to_owned();
-            let t = T::read_field(req, field, limits).await?;
-            state.insert(field_name, Box::new(t));
-            Ok(())
-        })
-    }
-
-    fn from_state(name: &str, state: &'t mut State) -> Result<Self, MultipartError> {
-        Ok(state.remove(name).map(|m| *m.downcast::<T>().unwrap()))
-    }
-}
-
-impl<'t, T> FieldGroupReader<'t> for Vec<T>
-where
-    T: FieldReader<'t>,
-{
-    type Future = LocalBoxFuture<'t, Result<(), MultipartError>>;
-
-    fn handle_field(
-        req: &'t HttpRequest,
-        field: Field,
-        limits: &'t mut Limits,
-        state: &'t mut State,
-        _duplicate_field: DuplicateField,
-    ) -> Self::Future {
-        Box::pin(async move {
-            // Note: Vec GroupReader always allows duplicates
-
-            let field_name = field.name().to_owned();
-
-            let vec = state
-                .entry(field_name)
-                .or_insert_with(|| Box::<Vec<T>>::default())
-                .downcast_mut::<Vec<T>>()
-                .unwrap();
-
-            let item = T::read_field(req, field, limits).await?;
-            vec.push(item);
-
-            Ok(())
-        })
-    }
-
-    fn from_state(name: &str, state: &'t mut State) -> Result<Self, MultipartError> {
-        Ok(state
-            .remove(name)
-            .map(|m| *m.downcast::<Vec<T>>().unwrap())
-            .unwrap_or_default())
-    }
-}
-
-impl<'t, T> FieldGroupReader<'t> for T
-where
-    T: FieldReader<'t>,
-{
-    type Future = LocalBoxFuture<'t, Result<(), MultipartError>>;
-
-    fn handle_field(
-        req: &'t HttpRequest,
-        field: Field,
-        limits: &'t mut Limits,
-        state: &'t mut State,
-        duplicate_field: DuplicateField,
-    ) -> Self::Future {
-        if state.contains_key(field.name()) {
-            match duplicate_field {
-                DuplicateField::Ignore => return Box::pin(ready(Ok(()))),
-
-                DuplicateField::Deny => {
-                    return Box::pin(ready(Err(MultipartError::DuplicateField(
-                        field.name().to_owned(),
-                    ))))
-                }
-
-                DuplicateField::Replace => {}
-            }
-        }
-
-        Box::pin(async move {
-            let field_name = field.name().to_owned();
-            let t = T::read_field(req, field, limits).await?;
-            state.insert(field_name, Box::new(t));
-            Ok(())
-        })
-    }
-
-    fn from_state(name: &str, state: &'t mut State) -> Result<Self, MultipartError> {
-        state
-            .remove(name)
-            .map(|m| *m.downcast::<T>().unwrap())
-            .ok_or_else(|| MultipartError::MissingField(name.to_owned()))
-    }
-}
-
-/// Trait that allows a type to be used in the [`struct@MultipartForm`] extractor.
-///
-/// You should use the [`macro@MultipartForm`] macro to derive this for your struct.
-pub trait MultipartCollect: Sized {
-    /// An optional limit in bytes to be applied a given field name. Note this limit will be shared
-    /// across all fields sharing the same name.
-    fn limit(field_name: &str) -> Option<usize>;
-
-    /// The extractor will call this function for each incoming field, the state can be updated
-    /// with the processed field data.
-    fn handle_field<'t>(
-        req: &'t HttpRequest,
-        field: Field,
-        limits: &'t mut Limits,
-        state: &'t mut State,
-    ) -> LocalBoxFuture<'t, Result<(), MultipartError>>;
-
-    /// Once all the fields have been processed and stored in the state, this is called
-    /// to convert into the struct representation.
-    fn from_state(state: State) -> Result<Self, MultipartError>;
-}
-
-#[doc(hidden)]
-pub enum DuplicateField {
-    /// Additional fields are not processed.
-    Ignore,
-
-    /// An error will be raised.
-    Deny,
-
-    /// All fields will be processed, the last one will replace all previous.
-    Replace,
-}
-
-/// Used to keep track of the remaining limits for the form and current field.
-pub struct Limits {
-    pub total_limit_remaining: usize,
-    pub memory_limit_remaining: usize,
-    pub field_limit_remaining: Option<usize>,
-}
-
-impl Limits {
-    pub fn new(total_limit: usize, memory_limit: usize) -> Self {
-        Self {
-            total_limit_remaining: total_limit,
-            memory_limit_remaining: memory_limit,
-            field_limit_remaining: None,
-        }
-    }
-
-    /// This function should be called within a [`FieldReader`] when reading each chunk of a field
-    /// to ensure that the form limits are not exceeded.
-    ///
-    /// # Arguments
-    ///
-    /// * `bytes` - The number of bytes being read from this chunk
-    /// * `in_memory` - Whether to consume from the memory limits
-    pub fn try_consume_limits(
-        &mut self,
-        bytes: usize,
-        in_memory: bool,
-    ) -> Result<(), MultipartError> {
-        self.total_limit_remaining = self
-            .total_limit_remaining
-            .checked_sub(bytes)
-            .ok_or(MultipartError::Payload(PayloadError::Overflow))?;
-
-        if in_memory {
-            self.memory_limit_remaining = self
-                .memory_limit_remaining
-                .checked_sub(bytes)
-                .ok_or(MultipartError::Payload(PayloadError::Overflow))?;
-        }
-
-        if let Some(field_limit) = self.field_limit_remaining {
-            self.field_limit_remaining = Some(
-                field_limit
-                    .checked_sub(bytes)
-                    .ok_or(MultipartError::Payload(PayloadError::Overflow))?,
-            );
-        }
-
-        Ok(())
-    }
-}
-
-/// Typed `multipart/form-data` extractor.
-///
-/// To extract typed data from a multipart stream, the inner type `T` must implement the
-/// [`MultipartCollect`] trait. You should use the [`macro@MultipartForm`] macro to derive this
-/// for your struct.
-///
-/// Add a [`MultipartFormConfig`] to your app data to configure extraction.
-#[derive(Deref, DerefMut)]
-pub struct MultipartForm<T: MultipartCollect>(pub T);
-
-impl<T: MultipartCollect> MultipartForm<T> {
-    /// Unwrap into inner `T` value.
-    pub fn into_inner(self) -> T {
-        self.0
-    }
-}
-
-impl<T> FromRequest for MultipartForm<T>
-where
-    T: MultipartCollect,
-{
-    type Error = Error;
-    type Future = LocalBoxFuture<'static, Result<Self, Self::Error>>;
-
-    #[inline]
-    fn from_request(req: &HttpRequest, payload: &mut dev::Payload) -> Self::Future {
-        let mut payload = Multipart::new(req.headers(), payload.take());
-
-        let config = MultipartFormConfig::from_req(req);
-        let mut limits = Limits::new(config.total_limit, config.memory_limit);
-
-        let req = req.clone();
-        let req2 = req.clone();
-        let err_handler = config.err_handler.clone();
-
-        Box::pin(
-            async move {
-                let mut state = State::default();
-                // We need to ensure field limits are shared for all instances of this field name
-                let mut field_limits = HashMap::<String, Option<usize>>::new();
-
-                while let Some(field) = payload.try_next().await? {
-                    // Retrieve the limit for this field
-                    let entry = field_limits
-                        .entry(field.name().to_owned())
-                        .or_insert_with(|| T::limit(field.name()));
-                    limits.field_limit_remaining = entry.to_owned();
-
-                    T::handle_field(&req, field, &mut limits, &mut state).await?;
-
-                    // Update the stored limit
-                    *entry = limits.field_limit_remaining;
-                }
-                let inner = T::from_state(state)?;
-                Ok(MultipartForm(inner))
-            }
-            .map_err(move |err| {
-                if let Some(handler) = err_handler {
-                    (*handler)(err, &req2)
-                } else {
-                    err.into()
-                }
-            }),
-        )
-    }
-}
-
-type MultipartFormErrorHandler =
-    Option<Arc<dyn Fn(MultipartError, &HttpRequest) -> Error + Send + Sync>>;
-
-/// [`struct@MultipartForm`] extractor configuration.
-///
-/// Add to your app data to have it picked up by [`struct@MultipartForm`] extractors.
-#[derive(Clone)]
-pub struct MultipartFormConfig {
-    total_limit: usize,
-    memory_limit: usize,
-    err_handler: MultipartFormErrorHandler,
-}
-
-impl MultipartFormConfig {
-    /// Sets maximum accepted payload size for the entire form. By default this limit is 50MiB.
-    pub fn total_limit(mut self, total_limit: usize) -> Self {
-        self.total_limit = total_limit;
-        self
-    }
-
-    /// Sets maximum accepted data that will be read into memory. By default this limit is 2MiB.
-    pub fn memory_limit(mut self, memory_limit: usize) -> Self {
-        self.memory_limit = memory_limit;
-        self
-    }
-
-    /// Sets custom error handler.
-    pub fn error_handler<F>(mut self, f: F) -> Self
-    where
-        F: Fn(MultipartError, &HttpRequest) -> Error + Send + Sync + 'static,
-    {
-        self.err_handler = Some(Arc::new(f));
-        self
-    }
-
-    /// Extracts payload config from app data. Check both `T` and `Data<T>`, in that order, and fall
-    /// back to the default payload config.
-    fn from_req(req: &HttpRequest) -> &Self {
-        req.app_data::<Self>()
-            .or_else(|| req.app_data::<web::Data<Self>>().map(|d| d.as_ref()))
-            .unwrap_or(&DEFAULT_CONFIG)
-    }
-}
-
-const DEFAULT_CONFIG: MultipartFormConfig = MultipartFormConfig {
-    total_limit: 52_428_800, // 50 MiB
-    memory_limit: 2_097_152, // 2 MiB
-    err_handler: None,
-};
-
-impl Default for MultipartFormConfig {
-    fn default() -> Self {
-        DEFAULT_CONFIG
-    }
-}
-
-#[cfg(test)]
-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 awc::{Client, ClientResponse};
-
-    use super::MultipartForm;
-    use crate::form::{bytes::Bytes, tempfile::TempFile, text::Text, MultipartFormConfig};
-
-    pub async fn send_form(
-        srv: &TestServer,
-        form: multipart::Form<'static>,
-        uri: &'static str,
-    ) -> ClientResponse<Decoder<Payload>> {
-        Client::default()
-            .post(srv.url(uri))
-            .content_type(form.content_type())
-            .send_body(multipart::Body::from(form))
-            .await
-            .unwrap()
-    }
-
-    /// Test `Option` fields.
-    #[derive(MultipartForm)]
-    struct TestOptions {
-        field1: Option<Text<String>>,
-        field2: Option<Text<String>>,
-    }
-
-    async fn test_options_route(form: MultipartForm<TestOptions>) -> impl Responder {
-        assert!(form.field1.is_some());
-        assert!(form.field2.is_none());
-        HttpResponse::Ok().finish()
-    }
-
-    #[actix_rt::test]
-    async fn test_options() {
-        let srv =
-            actix_test::start(|| App::new().route("/", web::post().to(test_options_route)));
-
-        let mut form = multipart::Form::default();
-        form.add_text("field1", "value");
-
-        let response = send_form(&srv, form, "/").await;
-        assert_eq!(response.status(), StatusCode::OK);
-    }
-
-    /// Test `Vec` fields.
-    #[derive(MultipartForm)]
-    struct TestVec {
-        list1: Vec<Text<String>>,
-        list2: Vec<Text<String>>,
-    }
-
-    async fn test_vec_route(form: MultipartForm<TestVec>) -> impl Responder {
-        let form = form.into_inner();
-        let strings = form
-            .list1
-            .into_iter()
-            .map(|s| s.into_inner())
-            .collect::<Vec<_>>();
-        assert_eq!(strings, vec!["value1", "value2", "value3"]);
-        assert_eq!(form.list2.len(), 0);
-        HttpResponse::Ok().finish()
-    }
-
-    #[actix_rt::test]
-    async fn test_vec() {
-        let srv = actix_test::start(|| App::new().route("/", web::post().to(test_vec_route)));
-
-        let mut form = multipart::Form::default();
-        form.add_text("list1", "value1");
-        form.add_text("list1", "value2");
-        form.add_text("list1", "value3");
-
-        let response = send_form(&srv, form, "/").await;
-        assert_eq!(response.status(), StatusCode::OK);
-    }
-
-    /// Test the `rename` field attribute.
-    #[derive(MultipartForm)]
-    struct TestFieldRenaming {
-        #[multipart(rename = "renamed")]
-        field1: Text<String>,
-        #[multipart(rename = "field1")]
-        field2: Text<String>,
-        field3: Text<String>,
-    }
-
-    async fn test_field_renaming_route(
-        form: MultipartForm<TestFieldRenaming>,
-    ) -> impl Responder {
-        assert_eq!(&*form.field1, "renamed");
-        assert_eq!(&*form.field2, "field1");
-        assert_eq!(&*form.field3, "field3");
-        HttpResponse::Ok().finish()
-    }
-
-    #[actix_rt::test]
-    async fn test_field_renaming() {
-        let srv = actix_test::start(|| {
-            App::new().route("/", web::post().to(test_field_renaming_route))
-        });
-
-        let mut form = multipart::Form::default();
-        form.add_text("renamed", "renamed");
-        form.add_text("field1", "field1");
-        form.add_text("field3", "field3");
-
-        let response = send_form(&srv, form, "/").await;
-        assert_eq!(response.status(), StatusCode::OK);
-    }
-
-    /// Test the `deny_unknown_fields` struct attribute.
-    #[derive(MultipartForm)]
-    #[multipart(deny_unknown_fields)]
-    struct TestDenyUnknown {}
-
-    #[derive(MultipartForm)]
-    struct TestAllowUnknown {}
-
-    async fn test_deny_unknown_route(_: MultipartForm<TestDenyUnknown>) -> impl Responder {
-        HttpResponse::Ok().finish()
-    }
-
-    async fn test_allow_unknown_route(_: MultipartForm<TestAllowUnknown>) -> impl Responder {
-        HttpResponse::Ok().finish()
-    }
-
-    #[actix_rt::test]
-    async fn test_deny_unknown() {
-        let srv = actix_test::start(|| {
-            App::new()
-                .route("/deny", web::post().to(test_deny_unknown_route))
-                .route("/allow", web::post().to(test_allow_unknown_route))
-        });
-
-        let mut form = multipart::Form::default();
-        form.add_text("unknown", "value");
-        let response = send_form(&srv, form, "/deny").await;
-        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-
-        let mut form = multipart::Form::default();
-        form.add_text("unknown", "value");
-        let response = send_form(&srv, form, "/allow").await;
-        assert_eq!(response.status(), StatusCode::OK);
-    }
-
-    /// Test the `duplicate_field` struct attribute.
-    #[derive(MultipartForm)]
-    #[multipart(duplicate_field = "deny")]
-    struct TestDuplicateDeny {
-        _field: Text<String>,
-    }
-
-    #[derive(MultipartForm)]
-    #[multipart(duplicate_field = "replace")]
-    struct TestDuplicateReplace {
-        field: Text<String>,
-    }
-
-    #[derive(MultipartForm)]
-    #[multipart(duplicate_field = "ignore")]
-    struct TestDuplicateIgnore {
-        field: Text<String>,
-    }
-
-    async fn test_duplicate_deny_route(_: MultipartForm<TestDuplicateDeny>) -> impl Responder {
-        HttpResponse::Ok().finish()
-    }
-
-    async fn test_duplicate_replace_route(
-        form: MultipartForm<TestDuplicateReplace>,
-    ) -> impl Responder {
-        assert_eq!(&*form.field, "second_value");
-        HttpResponse::Ok().finish()
-    }
-
-    async fn test_duplicate_ignore_route(
-        form: MultipartForm<TestDuplicateIgnore>,
-    ) -> impl Responder {
-        assert_eq!(&*form.field, "first_value");
-        HttpResponse::Ok().finish()
-    }
-
-    #[actix_rt::test]
-    async fn test_duplicate_field() {
-        let srv = actix_test::start(|| {
-            App::new()
-                .route("/deny", web::post().to(test_duplicate_deny_route))
-                .route("/replace", web::post().to(test_duplicate_replace_route))
-                .route("/ignore", web::post().to(test_duplicate_ignore_route))
-        });
-
-        let mut form = multipart::Form::default();
-        form.add_text("_field", "first_value");
-        form.add_text("_field", "second_value");
-        let response = send_form(&srv, form, "/deny").await;
-        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-
-        let mut form = multipart::Form::default();
-        form.add_text("field", "first_value");
-        form.add_text("field", "second_value");
-        let response = send_form(&srv, form, "/replace").await;
-        assert_eq!(response.status(), StatusCode::OK);
-
-        let mut form = multipart::Form::default();
-        form.add_text("field", "first_value");
-        form.add_text("field", "second_value");
-        let response = send_form(&srv, form, "/ignore").await;
-        assert_eq!(response.status(), StatusCode::OK);
-    }
-
-    /// Test the Limits.
-    #[derive(MultipartForm)]
-    struct TestMemoryUploadLimits {
-        field: Bytes,
-    }
-
-    #[derive(MultipartForm)]
-    struct TestFileUploadLimits {
-        field: TempFile,
-    }
-
-    async fn test_upload_limits_memory(
-        form: MultipartForm<TestMemoryUploadLimits>,
-    ) -> impl Responder {
-        assert!(!form.field.data.is_empty());
-        HttpResponse::Ok().finish()
-    }
-
-    async fn test_upload_limits_file(
-        form: MultipartForm<TestFileUploadLimits>,
-    ) -> impl Responder {
-        assert!(form.field.size > 0);
-        HttpResponse::Ok().finish()
-    }
-
-    #[actix_rt::test]
-    async fn test_memory_limits() {
-        let srv = actix_test::start(|| {
-            App::new()
-                .route("/text", web::post().to(test_upload_limits_memory))
-                .route("/file", web::post().to(test_upload_limits_file))
-                .app_data(
-                    MultipartFormConfig::default()
-                        .memory_limit(20)
-                        .total_limit(usize::MAX),
-                )
-        });
-
-        // Exceeds the 20 byte memory limit
-        let mut form = multipart::Form::default();
-        form.add_text("field", "this string is 28 bytes long");
-        let response = send_form(&srv, form, "/text").await;
-        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-
-        // Memory limit should not apply when the data is being streamed to disk
-        let mut form = multipart::Form::default();
-        form.add_text("field", "this string is 28 bytes long");
-        let response = send_form(&srv, form, "/file").await;
-        assert_eq!(response.status(), StatusCode::OK);
-    }
-
-    #[actix_rt::test]
-    async fn test_total_limit() {
-        let srv = actix_test::start(|| {
-            App::new()
-                .route("/text", web::post().to(test_upload_limits_memory))
-                .route("/file", web::post().to(test_upload_limits_file))
-                .app_data(
-                    MultipartFormConfig::default()
-                        .memory_limit(usize::MAX)
-                        .total_limit(20),
-                )
-        });
-
-        // Within the 20 byte limit
-        let mut form = multipart::Form::default();
-        form.add_text("field", "7 bytes");
-        let response = send_form(&srv, form, "/text").await;
-        assert_eq!(response.status(), StatusCode::OK);
-
-        // Exceeds the 20 byte overall limit
-        let mut form = multipart::Form::default();
-        form.add_text("field", "this string is 28 bytes long");
-        let response = send_form(&srv, form, "/text").await;
-        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-
-        // Exceeds the 20 byte overall limit
-        let mut form = multipart::Form::default();
-        form.add_text("field", "this string is 28 bytes long");
-        let response = send_form(&srv, form, "/file").await;
-        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-    }
-
-    #[derive(MultipartForm)]
-    struct TestFieldLevelLimits {
-        #[multipart(limit = "30B")]
-        field: Vec<Bytes>,
-    }
-
-    async fn test_field_level_limits_route(
-        form: MultipartForm<TestFieldLevelLimits>,
-    ) -> impl Responder {
-        assert!(!form.field.is_empty());
-        HttpResponse::Ok().finish()
-    }
-
-    #[actix_rt::test]
-    async fn test_field_level_limits() {
-        let srv = actix_test::start(|| {
-            App::new()
-                .route("/", web::post().to(test_field_level_limits_route))
-                .app_data(
-                    MultipartFormConfig::default()
-                        .memory_limit(usize::MAX)
-                        .total_limit(usize::MAX),
-                )
-        });
-
-        // Within the 30 byte limit
-        let mut form = multipart::Form::default();
-        form.add_text("field", "this string is 28 bytes long");
-        let response = send_form(&srv, form, "/").await;
-        assert_eq!(response.status(), StatusCode::OK);
-
-        // Exceeds the the 30 byte limit
-        let mut form = multipart::Form::default();
-        form.add_text("field", "this string is more than 30 bytes long");
-        let response = send_form(&srv, form, "/").await;
-        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-
-        // Total of values (14 bytes) is within 30 byte limit for "field"
-        let mut form = multipart::Form::default();
-        form.add_text("field", "7 bytes");
-        form.add_text("field", "7 bytes");
-        let response = send_form(&srv, form, "/").await;
-        assert_eq!(response.status(), StatusCode::OK);
-
-        // Total of values exceeds 30 byte limit for "field"
-        let mut form = multipart::Form::default();
-        form.add_text("field", "this string is 28 bytes long");
-        form.add_text("field", "this string is 28 bytes long");
-        let response = send_form(&srv, form, "/").await;
-        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-    }
-}