.cargo/config.toml

@@ -0,0 +1,14 @@
+[alias]
+lint = "clippy --workspace --tests --examples --bins -- -Dclippy::todo"
+lint-all = "clippy --workspace --all-features --tests --examples --bins -- -Dclippy::todo"
+
+# lib checking
+ci-check-min = "hack --workspace check --no-default-features"
+ci-check-default = "hack --workspace check"
+ci-check-default-tests = "check --workspace --tests"
+ci-check-all-feature-powerset="hack --workspace --feature-powerset --skip=__compress,io-uring check"
+ci-check-all-feature-powerset-linux="hack --workspace --feature-powerset --skip=__compress check"
+
+# testing
+ci-doctest-default = "test --workspace --doc --no-fail-fast -- --nocapture"
+ci-doctest = "test --workspace --all-features --doc --no-fail-fast -- --nocapture"

.clippy.toml

@@ -1,7 +0,0 @@
-disallowed-names = [
-    "e", # no single letter error bindings
-]
-disallowed-methods = [
-    "std::cell::RefCell::default()",
-    "std::rc::Rc::default()",
-]

.cspell.yml

@@ -1,3 +0,0 @@
-version: "0.2"
-words:
-  - actix

.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/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: cargo
-    directory: /
-    schedule:
-      interval: weekly
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly

.github/workflows/bench.yml

@@ -2,27 +2,25 @@ name: Benchmark
 
 on:
   push:
-    branches: [master]
+    branches:
-
+      - master
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
 
 jobs:
   check_benchmark:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: Install Rust
-        run: |
+        uses: actions-rs/toolchain@v1
-          rustup set profile minimal
+        with:
-          rustup install nightly
+          toolchain: nightly
-          rustup override set nightly
+          profile: minimal
+          override: true
 
       - name: Check benchmark
-        run: cargo bench --bench=server -- --sample-size=15
+        uses: actions-rs/cargo@v1
+        with:
+          command: bench
+          args: --bench=server -- --sample-size=15

.github/workflows/ci-master.yml

@@ -0,0 +1,153 @@
+name: CI (master only)
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  build_and_test_nightly:
+    strategy:
+      fail-fast: false
+      matrix:
+        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-2022, triple: x86_64-pc-windows-msvc }
+        version:
+          - nightly
+
+    name: ${{ matrix.target.name }} / ${{ matrix.version }}
+    runs-on: ${{ matrix.target.os }}
+
+    env:
+      CI: 1
+      CARGO_INCREMENTAL: 0
+      VCPKGRS_DYNAMIC: 1
+
+    steps:
+      - 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.triple == 'x86_64-pc-windows-msvc'
+        run: vcpkg install openssl:x64-windows
+
+      - name: Install ${{ matrix.version }}
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
+          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: Install cargo-hack
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cargo-hack
+
+      - name: check minimal
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-min }
+
+      - name: check default
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-default }
+
+      - name: tests
+        timeout-minutes: 60
+        run: |
+          cargo test --lib --tests -p=actix-router --all-features
+          cargo test --lib --tests -p=actix-http --all-features
+          cargo test --lib --tests -p=actix-web --features=rustls,openssl -- --skip=test_reading_deflate_encoding_large_random_rustls
+          cargo test --lib --tests -p=actix-web-codegen --all-features
+          cargo test --lib --tests -p=awc --all-features
+          cargo test --lib --tests -p=actix-http-test --all-features
+          cargo test --lib --tests -p=actix-test --all-features
+          cargo test --lib --tests -p=actix-files
+          cargo test --lib --tests -p=actix-multipart --all-features
+          cargo test --lib --tests -p=actix-web-actors --all-features
+
+      - name: tests (io-uring)
+        if: matrix.target.os == 'ubuntu-latest'
+        timeout-minutes: 60
+        run: >
+          sudo bash -c "ulimit -Sl 512
+          && ulimit -Hl 512
+          && PATH=$PATH:/usr/share/rust/.cargo/bin
+          && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo test --lib --tests -p=actix-files --all-features"
+
+      - name: Clear the cargo caches
+        run: |
+          cargo install cargo-cache --version 0.6.3 --no-default-features --features ci-autoclean
+          cargo-cache
+
+  ci_feature_powerset_check:
+    name: Verify Feature Combinations
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - 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: Install cargo-hack
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cargo-hack
+
+      - name: check feature combinations
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-all-feature-powerset }
+      
+      - name: check feature combinations
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-all-feature-powerset-linux }
+
+  coverage:
+    name: coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - 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: |
+          cargo install cargo-tarpaulin --vers "^0.13"
+          cargo tarpaulin --workspace --features=rustls,openssl --out Xml --verbose
+      - name: Upload to Codecov
+        uses: codecov/codecov-action@v1
+        with: { file: cobertura.xml }

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

@@ -1,91 +0,0 @@
-name: CI (post-merge)
-
-on:
-  push:
-    branches: [master]
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build_and_test_nightly:
-    strategy:
-      fail-fast: false
-      matrix:
-        # prettier-ignore
-        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 }
-        version:
-          - { name: nightly, version: nightly }
-
-    name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
-    runs-on: ${{ matrix.target.os }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install nasm
-        if: matrix.target.os == 'windows-latest'
-        uses: ilammy/setup-nasm@v1.5.2
-
-      - name: Install OpenSSL
-        if: matrix.target.os == 'windows-latest'
-        shell: bash
-        run: |
-          set -e
-          choco install openssl --version=1.1.1.2100 -y --no-progress
-          echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' >> $GITHUB_ENV
-          echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
-
-      - name: Install Rust (${{ matrix.version.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
-        with:
-          toolchain: ${{ matrix.version.version }}
-
-      - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.49.45
-        with:
-          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
-
-      - name: check minimal
-        run: just check-min
-
-      - name: check default
-        run: just check-default
-
-      - name: tests
-        timeout-minutes: 60
-        run: just test
-
-      - name: CI cache clean
-        run: cargo-ci-cache-clean
-
-  ci_feature_powerset_check:
-    name: Verify Feature Combinations
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Free Disk Space
-        run: ./scripts/free-disk-space.sh
-
-      - name: Setup mold linker
-        uses: rui314/setup-mold@v1
-
-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
-
-      - name: Install just, cargo-hack
-        uses: taiki-e/install-action@v2.49.45
-        with:
-          tool: just,cargo-hack
-
-      - name: Check feature combinations
-        run: just check-feature-combinations

.github/workflows/ci.yml

@@ -3,119 +3,118 @@ name: CI
 on:
   pull_request:
     types: [opened, synchronize, reopened]
-  merge_group:
-    types: [checks_requested]
   push:
     branches: [master]
 
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  read_msrv:
-    name: Read MSRV
-    uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@v0.1.0
-
   build_and_test:
-    needs: read_msrv
-
     strategy:
       fail-fast: false
       matrix:
-        # prettier-ignore
         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:
-          - { name: msrv, version: "${{ needs.read_msrv.outputs.msrv }}" }
+          - 1.54.0 # MSRV
-          - { name: stable, version: stable }
+          - stable
 
-    name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
+    name: ${{ matrix.target.name }} / ${{ matrix.version }}
     runs-on: ${{ matrix.target.os }}
 
+    env:
+      CI: 1
+      CARGO_INCREMENTAL: 0
+      VCPKGRS_DYNAMIC: 1
+
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
-
-      - name: Install nasm
-        if: matrix.target.os == 'windows-latest'
-        uses: ilammy/setup-nasm@v1.5.2
 
+      # 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'
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc'
-        shell: bash
+        run: vcpkg install openssl:x64-windows
-        run: |
-          set -e
-          choco install openssl --version=1.1.1.2100 -y --no-progress
-          echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' >> $GITHUB_ENV
-          echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
 
-      - name: Setup mold linker
+      - name: Install ${{ matrix.version }}
-        if: matrix.target.os == 'ubuntu-latest'
+        uses: actions-rs/toolchain@v1
-        uses: rui314/setup-mold@v1
-
-      - name: Install Rust (${{ matrix.version.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
         with:
-          toolchain: ${{ matrix.version.version }}
+          toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
+          profile: minimal
+          override: true
 
-      - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
+      - name: Generate Cargo.lock
-        uses: taiki-e/install-action@v2.49.45
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
+
+      - name: Install cargo-hack
+        uses: actions-rs/cargo@v1
         with:
-          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
+          command: install
-
+          args: cargo-hack
-      - name: workaround MSRV issues
-        if: matrix.version.name == 'msrv'
-        run: just downgrade-for-msrv
 
       - name: check minimal
-        run: just check-min
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-min }
 
       - name: check default
-        run: just check-default
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-default }
 
       - name: tests
         timeout-minutes: 60
-        run: just test
+        run: |
-
+          cargo test --lib --tests -p=actix-router --all-features
-      - name: CI cache clean
+          cargo test --lib --tests -p=actix-http --all-features
-        run: cargo-ci-cache-clean
+          cargo test --lib --tests -p=actix-web --features=rustls,openssl -- --skip=test_reading_deflate_encoding_large_random_rustls
-
+          cargo test --lib --tests -p=actix-web-codegen --all-features
-  io-uring:
+          cargo test --lib --tests -p=awc --all-features
-    name: io-uring tests
+          cargo test --lib --tests -p=actix-http-test --all-features
-    runs-on: ubuntu-latest
+          cargo test --lib --tests -p=actix-test --all-features
-    steps:
+          cargo test --lib --tests -p=actix-files
-      - uses: actions/checkout@v4
+          cargo test --lib --tests -p=actix-multipart --all-features
-
+          cargo test --lib --tests -p=actix-web-actors --all-features
-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
-        with:
-          toolchain: nightly
 
       - name: tests (io-uring)
+        if: matrix.target.os == 'ubuntu-latest'
         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=${{ matrix.version }} cargo test --lib --tests -p=actix-files --all-features"
+
+      - name: Clear the cargo caches
+        run: |
+          cargo install cargo-cache --version 0.6.3 --no-default-features --features ci-autoclean
+          cargo-cache
 
   rustdoc:
     name: doc tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
 
-      - name: Install just
+      - name: Generate Cargo.lock
-        uses: taiki-e/install-action@v2.49.45
+        uses: actions-rs/cargo@v1
-        with:
+        with: { command: generate-lockfile }
-          tool: just
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.3.0
 
       - name: doc tests
-        run: just test-docs
+        uses: actions-rs/cargo@v1
+        timeout-minutes: 60
+        with: { command: ci-doctest }

.github/workflows/clippy-fmt.yml

@@ -0,0 +1,66 @@
+name: Lint
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          components: rustfmt
+      - name: Check with rustfmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          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@v2
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          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

@@ -1,40 +0,0 @@
-name: Coverage
-
-on:
-  push:
-    branches: [master]
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  coverage:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
-        with:
-          toolchain: nightly
-          components: llvm-tools
-
-      - name: Install just, cargo-llvm-cov, cargo-nextest
-        uses: taiki-e/install-action@v2.49.45
-        with:
-          tool: just,cargo-llvm-cov,cargo-nextest
-
-      - name: Generate code coverage
-        run: just test-coverage-codecov
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.4.0
-        with:
-          files: codecov.json
-          fail_ci_if_error: true
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/lint.yml

@@ -1,90 +0,0 @@
-name: Lint
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  fmt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
-        with:
-          toolchain: nightly
-          components: rustfmt
-
-      - name: Check with Rustfmt
-        run: cargo fmt --all -- --check
-
-  clippy:
-    permissions:
-      contents: read
-      checks: write # to add clippy checks to PR diffs
-
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
-        with:
-          components: clippy
-
-      - name: Check with Clippy
-        uses: giraffate/clippy-action@v1.0.1
-        with:
-          reporter: github-pr-check
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          clippy_flags: >-
-            --workspace --all-features --tests --examples --bins --
-            -A unknown_lints -D clippy::todo -D clippy::dbg_macro
-
-  lint-docs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
-        with:
-          toolchain: nightly
-          components: rust-docs
-
-      - name: Check for broken intra-doc links
-        env:
-          RUSTDOCFLAGS: -D warnings
-        run: cargo +nightly doc --no-deps --workspace --all-features
-
-  check-external-types:
-    if: false # rustdoc mismatch currently
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Rust (${{ vars.RUST_VERSION_EXTERNAL_TYPES }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
-        with:
-          toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
-
-      - name: Install just
-        uses: taiki-e/install-action@v2.49.45
-        with:
-          tool: just
-
-      - name: Install cargo-check-external-types
-        uses: taiki-e/cache-cargo-install-action@v2.1.1
-        with:
-          tool: cargo-check-external-types
-
-      - name: check external types
-        run: just check-external-types-all +${{ vars.RUST_VERSION_EXTERNAL_TYPES }}

.github/workflows/upload-doc.yml

@@ -0,0 +1,35 @@
+name: Upload Documentation
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
+
+      - name: Build Docs
+        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@3.7.1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: target/doc

.gitignore

@@ -1,3 +1,4 @@
+Cargo.lock
 target/
 guide/build/
 /gh-pages
@@ -18,7 +19,3 @@ guide/build/
 
 # Configuration directory generated by VSCode
 .vscode
-
-# code coverage
-/lcov.info
-/codecov.json

.prettierrc.yml

@@ -1,5 +0,0 @@
-overrides:
-  - files: "*.md"
-    options:
-      printWidth: 9999
-      proseWrap: never

.rustfmt.toml

@@ -1,3 +0,0 @@
-group_imports = "StdExternalCrate"
-imports_granularity = "Crate"
-use_field_init_shorthand = true

Cargo.toml

@@ -1,25 +1,130 @@
+[package]
+name = "actix-web"
+version = "4.0.0-rc.1"
+authors = [
+    "Nikolay Kim <fafhrd91@gmail.com>",
+    "Rob Ede <robjtede@icloud.com>",
+]
+description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
+keywords = ["actix", "http", "web", "framework", "async"]
+categories = [
+    "network-programming",
+    "asynchronous",
+    "web-programming::http-server",
+    "web-programming::websocket"
+]
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-web.git"
+license = "MIT OR Apache-2.0"
+edition = "2018"
+
+[package.metadata.docs.rs]
+# features that docs.rs will build with
+features = ["openssl", "rustls", "compress-brotli", "compress-gzip", "compress-zstd", "cookies", "secure-cookies"]
+rustdoc-args = ["--cfg", "docsrs"]
+
+[lib]
+name = "actix_web"
+path = "src/lib.rs"
+
 [workspace]
 resolver = "2"
 members = [
+    ".",
     "actix-files",
     "actix-http-test",
     "actix-http",
     "actix-multipart",
-    "actix-multipart-derive",
     "actix-router",
     "actix-test",
     "actix-web-actors",
     "actix-web-codegen",
-    "actix-web",
     "awc",
 ]
 
-[workspace.package]
+[features]
-homepage = "https://actix.rs"
+default = ["compress-brotli", "compress-gzip", "compress-zstd", "cookies"]
-repository = "https://github.com/actix/actix-web"
+
-license = "MIT OR Apache-2.0"
+# Brotli algorithm content-encoding support
-edition = "2021"
+compress-brotli = ["actix-http/compress-brotli", "__compress"]
-rust-version = "1.75"
+# Gzip and deflate algorithms content-encoding support
+compress-gzip = ["actix-http/compress-gzip", "__compress"]
+# Zstd algorithm content-encoding support
+compress-zstd = ["actix-http/compress-zstd", "__compress"]
+
+# support for cookies
+cookies = ["cookie"]
+
+# secure cookies feature
+secure-cookies = ["cookie/secure"]
+
+# openssl
+openssl = ["actix-http/openssl", "actix-tls/accept", "actix-tls/openssl"]
+
+# rustls
+rustls = ["actix-http/rustls", "actix-tls/accept", "actix-tls/rustls"]
+
+# Internal (PRIVATE!) features used to aid testing and checking feature status.
+# Don't rely on these whatsoever. They may disappear at anytime.
+__compress = []
+
+# io-uring feature only avaiable for Linux OSes.
+experimental-io-uring = ["actix-server/io-uring"]
+
+[dependencies]
+actix-codec = "0.4.1"
+actix-macros = "0.2.3"
+actix-rt = "2.6"
+actix-server = "2"
+actix-service = "2.0.0"
+actix-utils = "3.0.0"
+actix-tls = { version = "3.0.0", default-features = false, optional = true }
+
+actix-http = { version = "3.0.0-rc.1", features = ["http2", "ws"] }
+actix-router = "0.5.0-rc.3"
+actix-web-codegen = "0.5.0-rc.2"
+
+ahash = "0.7"
+bytes = "1"
+cfg-if = "1"
+cookie = { version = "0.16", features = ["percent-encode"], optional = true }
+derive_more = "0.99.5"
+encoding_rs = "0.8"
+futures-core = { version = "0.3.7", default-features = false }
+futures-util = { version = "0.3.7", default-features = false }
+itoa = "1"
+language-tags = "0.3"
+once_cell = "1.5"
+log = "0.4"
+mime = "0.3"
+pin-project-lite = "0.2.7"
+regex = "1.4"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_urlencoded = "0.7"
+smallvec = "1.6.1"
+socket2 = "0.4.0"
+time = { version = "0.3", default-features = false, features = ["formatting"] }
+url = "2.1"
+
+[dev-dependencies]
+actix-files = "0.6.0-beta.16"
+actix-test = { version = "0.1.0-beta.12", features = ["openssl", "rustls"] }
+awc = { version = "3.0.0-beta.20", features = ["openssl"] }
+
+brotli = "3.3.3"
+const-str = "0.3"
+criterion = { version = "0.3", features = ["html_reports"] }
+env_logger = "0.9"
+flate2 = "1.0.13"
+futures-util = { version = "0.3.7", default-features = false, features = ["std"] }
+rand = "0.8"
+rcgen = "0.8"
+rustls-pemfile = "0.2"
+static_assertions = "1"
+tls-openssl = { package = "openssl", version = "0.10.9" }
+tls-rustls = { package = "rustls", version = "0.20.0" }
+zstd = "0.9"
 
 [profile.dev]
 # Disabling debug info speeds up builds a bunch and we don't rely on it for debugging that much.
@@ -35,10 +140,9 @@ 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-web = { path = "." }
 actix-web-actors = { path = "actix-web-actors" }
 actix-web-codegen = { path = "actix-web-codegen" }
 awc = { path = "awc" }
@@ -52,10 +156,34 @@ awc = { path = "awc" }
 # actix-tls = { path = "../actix-net/actix-tls" }
 # actix-server = { path = "../actix-net/actix-server" }
 
-[workspace.lints.rust]
+[[test]]
-rust_2018_idioms = { level = "deny" }
+name = "test_server"
-future_incompatible = { level = "deny" }
+required-features = ["compress-brotli", "compress-gzip", "compress-zstd", "cookies"]
-nonstandard_style = { level = "deny" }
 
-[workspace.lints.clippy]
+[[test]]
-# clone_on_ref_ptr = { level = "deny" }
+name = "compression"
+required-features = ["compress-brotli", "compress-gzip", "compress-zstd"]
+
+[[example]]
+name = "basic"
+required-features = ["compress-gzip"]
+
+[[example]]
+name = "uds"
+required-features = ["compress-gzip"]
+
+[[example]]
+name = "on-connect"
+required-features = []
+
+[[bench]]
+name = "server"
+harness = false
+
+[[bench]]
+name = "service"
+harness = false
+
+[[bench]]
+name = "responder"
+harness = false

MIGRATION.md

@@ -0,0 +1,677 @@
+## Unreleased
+
+- The default `NormalizePath` behavior now strips trailing slashes by default. This was
+  previously documented to be the case in v3 but the behavior now matches. The effect is that
+  routes defined with trailing slashes will become inaccessible when
+  using `NormalizePath::default()`. As such, calling `NormalizePath::default()` will log a warning.
+  It is advised that the `new` method be used instead.
+  
+  Before: `#[get("/test/")]`  
+  After:  `#[get("/test")]`  
+
+  Alternatively, explicitly require trailing slashes: `NormalizePath::new(TrailingSlash::Always)`.
+
+- The `type Config` of `FromRequest` was removed.
+
+- Feature flag `compress` has been split into its supported algorithm (brotli, gzip, zstd).
+  By default all compression algorithms are enabled.
+  To select algorithm you want to include with `middleware::Compress` use following flags:
+  - `compress-brotli`
+  - `compress-gzip`
+  - `compress-zstd`
+  If you have set in your `Cargo.toml` dedicated `actix-web` features and you still want
+  to have compression enabled. Please change features selection like bellow:
+
+  Before: `"compress"`
+  After: `"compress-brotli", "compress-gzip", "compress-zstd"`
+
+
+## 3.0.0
+
+- The return type for `ServiceRequest::app_data::<T>()` was changed from returning a `Data<T>` to
+  simply a `T`. To access a `Data<T>` use `ServiceRequest::app_data::<Data<T>>()`.
+
+- Cookie handling has been offloaded to the `cookie` crate:
+  * `USERINFO_ENCODE_SET` is no longer exposed. Percent-encoding is still supported; check docs.
+  * Some types now require lifetime parameters.
+
+- The time crate was updated to `v0.2`, a major breaking change to the time crate, which affects
+  any `actix-web` method previously expecting a time v0.1 input.
+
+- Setting a cookie's SameSite property, explicitly, to `SameSite::None` will now
+  result in `SameSite=None` being sent with the response Set-Cookie header.
+  To create a cookie without a SameSite attribute, remove any calls setting same_site.
+
+- actix-http support for Actors messages was moved to actix-http crate and is enabled 
+  with feature `actors`
+
+- content_length function is removed from actix-http.
+  You can set Content-Length by normally setting the response body or calling no_chunking function. 
+
+- `BodySize::Sized64` variant has been removed. `BodySize::Sized` now receives a
+  `u64` instead of a `usize`.
+
+- Code that was using `path.<index>` to access a `web::Path<(A, B, C)>`s elements now needs to use
+  destructuring or `.into_inner()`. For example:
+
+  ```rust
+  // Previously:
+  async fn some_route(path: web::Path<(String, String)>) -> String {
+    format!("Hello, {} {}", path.0, path.1)
+  }
+
+  // Now (this also worked before):
+  async fn some_route(path: web::Path<(String, String)>) -> String {
+    let (first_name, last_name) = path.into_inner();
+    format!("Hello, {} {}", first_name, last_name)
+  }
+  // Or (this wasn't previously supported):
+  async fn some_route(web::Path((first_name, last_name)): web::Path<(String, String)>) -> String {
+    format!("Hello, {} {}", first_name, last_name)
+  }
+  ```
+
+- `middleware::NormalizePath` can now also be configured to trim trailing slashes instead of always keeping one.
+  It will need `middleware::normalize::TrailingSlash` when being constructed with `NormalizePath::new(...)`,
+  or for an easier migration you can replace `wrap(middleware::NormalizePath)` with `wrap(middleware::NormalizePath::new(TrailingSlash::MergeOnly))`.
+
+- `HttpServer::maxconn` is renamed to the more expressive `HttpServer::max_connections`.
+
+- `HttpServer::maxconnrate` is renamed to the more expressive `HttpServer::max_connection_rate`.
+
+
+## 2.0.0
+
+- `HttpServer::start()` renamed to `HttpServer::run()`. It also possible to
+  `.await` on `run` method result, in that case it awaits server exit.
+
+- `App::register_data()` renamed to `App::app_data()` and accepts any type `T: 'static`.
+  Stored data is available via `HttpRequest::app_data()` method at runtime.
+
+- Extractor configuration must be registered with `App::app_data()` instead of `App::data()`
+
+- Sync handlers has been removed. `.to_async()` method has been renamed to `.to()`
+  replace `fn` with `async fn` to convert sync handler to async
+
+- `actix_http_test::TestServer` moved to `actix_web::test` module. To start
+  test server use `test::start()` or `test_start_with_config()` methods
+
+- `ResponseError` trait has been reafctored. `ResponseError::error_response()` renders
+  http response.
+
+- Feature `rust-tls` renamed to `rustls`
+
+  instead of
+
+    ```rust
+    actix-web = { version = "2.0.0", features = ["rust-tls"] }
+    ```
+
+  use
+
+    ```rust
+    actix-web = { version = "2.0.0", features = ["rustls"] }
+    ```
+
+- Feature `ssl` renamed to `openssl`
+
+  instead of
+
+    ```rust
+    actix-web = { version = "2.0.0", features = ["ssl"] }
+    ```
+
+  use
+
+    ```rust
+    actix-web = { version = "2.0.0", features = ["openssl"] }
+    ```
+- `Cors` builder now requires that you call `.finish()` to construct the middleware
+
+## 1.0.1
+
+- Cors middleware has been moved to `actix-cors` crate
+
+  instead of
+
+  ```rust
+  use actix_web::middleware::cors::Cors;
+  ```
+
+  use
+
+  ```rust
+  use actix_cors::Cors;
+  ```
+
+- Identity middleware has been moved to `actix-identity` crate
+
+  instead of
+
+  ```rust
+  use actix_web::middleware::identity::{Identity, CookieIdentityPolicy, IdentityService};
+  ```
+
+  use
+
+  ```rust
+  use actix_identity::{Identity, CookieIdentityPolicy, IdentityService};
+  ```
+
+
+## 1.0.0
+
+- Extractor configuration. In version 1.0 this is handled with the new `Data` mechanism for both setting and retrieving the configuration
+
+  instead of
+
+  ```rust
+
+  #[derive(Default)]
+  struct ExtractorConfig {
+     config: String,
+  }
+
+  impl FromRequest for YourExtractor {
+     type Config = ExtractorConfig;
+     type Result = Result<YourExtractor, Error>;
+
+     fn from_request(req: &HttpRequest, cfg: &Self::Config) -> Self::Result {
+         println!("use the config: {:?}", cfg.config);
+         ...
+     }
+  }
+
+  App::new().resource("/route_with_config", |r| {
+     r.post().with_config(handler_fn, |cfg| {
+         cfg.0.config = "test".to_string();
+     })
+  })
+
+  ```
+
+  use the HttpRequest to get the configuration like any other `Data` with `req.app_data::<C>()` and set it with the `data()` method on the `resource`
+
+  ```rust
+  #[derive(Default)]
+  struct ExtractorConfig {
+     config: String,
+  }
+
+  impl FromRequest for YourExtractor {
+     type Error = Error;
+     type Future = Result<Self, Self::Error>;
+     type Config = ExtractorConfig;
+
+     fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
+         let cfg = req.app_data::<ExtractorConfig>();
+         println!("config data?: {:?}", cfg.unwrap().role);
+         ...
+     }
+  }
+
+  App::new().service(
+     resource("/route_with_config")
+         .data(ExtractorConfig {
+             config: "test".to_string(),
+         })
+         .route(post().to(handler_fn)),
+  )
+  ```
+
+- Resource registration. 1.0 version uses generalized resource
+  registration via `.service()` method.
+
+  instead of
+
+  ```rust
+    App.new().resource("/welcome", |r| r.f(welcome))
+  ```
+
+  use App's or Scope's `.service()` method. `.service()` method accepts
+  object that implements `HttpServiceFactory` trait. By default
+  actix-web provides `Resource` and `Scope` services.
+
+  ```rust
+    App.new().service(
+        web::resource("/welcome")
+            .route(web::get().to(welcome))
+            .route(web::post().to(post_handler))
+  ```
+
+- Scope registration.
+
+  instead of
+
+  ```rust
+      let app = App::new().scope("/{project_id}", |scope| {
+            scope
+                .resource("/path1", |r| r.f(|_| HttpResponse::Ok()))
+                .resource("/path2", |r| r.f(|_| HttpResponse::Ok()))
+                .resource("/path3", |r| r.f(|_| HttpResponse::MethodNotAllowed()))
+      });
+  ```
+
+  use `.service()` for registration and `web::scope()` as scope object factory.
+
+  ```rust
+      let app = App::new().service(
+          web::scope("/{project_id}")
+              .service(web::resource("/path1").to(|| HttpResponse::Ok()))
+              .service(web::resource("/path2").to(|| HttpResponse::Ok()))
+              .service(web::resource("/path3").to(|| HttpResponse::MethodNotAllowed()))
+      );
+  ```
+
+- `.with()`, `.with_async()` registration methods have been renamed to `.to()` and `.to_async()`.
+
+  instead of
+
+  ```rust
+    App.new().resource("/welcome", |r| r.with(welcome))
+  ```
+
+  use `.to()` or `.to_async()` methods
+
+  ```rust
+    App.new().service(web::resource("/welcome").to(welcome))
+  ```
+
+- Passing arguments to handler with extractors, multiple arguments are allowed
+
+  instead of
+
+  ```rust
+  fn welcome((body, req): (Bytes, HttpRequest)) -> ... {
+    ...
+  }
+  ```
+
+  use multiple arguments
+
+  ```rust
+  fn welcome(body: Bytes, req: HttpRequest) -> ... {
+    ...
+  }
+  ```
+
+- `.f()`, `.a()` and `.h()` handler registration methods have been removed.
+  Use `.to()` for handlers and `.to_async()` for async handlers. Handler function
+  must use extractors.
+
+  instead of
+
+  ```rust
+    App.new().resource("/welcome", |r| r.f(welcome))
+  ```
+
+  use App's `to()` or `to_async()` methods
+
+  ```rust
+    App.new().service(web::resource("/welcome").to(welcome))
+  ```
+
+- `HttpRequest` does not provide access to request's payload stream.
+
+  instead of
+
+  ```rust
+  fn index(req: &HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> {
+    req
+       .payload()
+       .from_err()
+       .fold((), |_, chunk| {
+            ...
+        })
+       .map(|_| HttpResponse::Ok().finish())
+       .responder()
+  }
+  ```
+
+  use `Payload` extractor
+
+  ```rust
+  fn index(stream: web::Payload) -> impl Future<Item=HttpResponse, Error=Error> {
+     stream
+       .from_err()
+       .fold((), |_, chunk| {
+            ...
+        })
+       .map(|_| HttpResponse::Ok().finish())
+  }
+  ```
+
+- `State` is now `Data`.  You register Data during the App initialization process
+  and then access it from handlers either using a Data extractor or using
+  HttpRequest's api.
+
+  instead of
+
+  ```rust
+    App.with_state(T)
+  ```
+
+  use App's `data` method
+
+  ```rust
+	App.new()
+       .data(T)
+  ```
+
+  and either use the Data extractor within your handler
+
+  ```rust
+    use actix_web::web::Data;
+
+	fn endpoint_handler(Data<T>)){
+      ...
+    }
+  ```
+
+  .. or access your Data element from the HttpRequest
+
+  ```rust
+	fn endpoint_handler(req: HttpRequest) {
+		let data: Option<Data<T>> = req.app_data::<T>();
+    }
+  ```
+
+
+- AsyncResponder is removed, use `.to_async()` registration method and `impl Future<>` as result type.
+
+  instead of
+
+  ```rust
+	use actix_web::AsyncResponder;
+
+    fn endpoint_handler(...) -> impl Future<Item=HttpResponse, Error=Error>{
+		...
+        .responder()
+	}
+  ```
+
+  .. simply omit AsyncResponder and the corresponding responder() finish method
+
+
+- Middleware
+
+  instead of
+
+  ```rust
+      let app = App::new()
+           .middleware(middleware::Logger::default())
+  ```
+
+  use `.wrap()` method
+
+  ```rust
+      let app = App::new()
+           .wrap(middleware::Logger::default())
+           .route("/index.html", web::get().to(index));
+  ```
+
+- `HttpRequest::body()`, `HttpRequest::urlencoded()`, `HttpRequest::json()`, `HttpRequest::multipart()`
+  method have been removed. Use `Bytes`, `String`, `Form`, `Json`, `Multipart` extractors instead.
+
+  instead of
+
+  ```rust
+  fn index(req: &HttpRequest) -> Responder {
+     req.body()
+       .and_then(|body| {
+          ...
+       })
+  }
+  ```
+
+  use
+
+  ```rust
+  fn index(body: Bytes) -> Responder {
+     ...
+  }
+  ```
+
+- `actix_web::server` module has been removed. To start http server use `actix_web::HttpServer` type
+
+- StaticFiles and NamedFile have been moved to a separate crate.
+
+  instead of `use actix_web::fs::StaticFile`
+
+  use `use actix_files::Files`
+
+  instead of `use actix_web::fs::Namedfile`
+
+  use `use actix_files::NamedFile`
+
+- Multipart has been moved to a separate crate.
+
+  instead of `use actix_web::multipart::Multipart`
+
+  use `use actix_multipart::Multipart`
+
+- Response compression is not enabled by default.
+  To enable, use `Compress` middleware, `App::new().wrap(Compress::default())`.
+
+- Session middleware moved to actix-session crate
+
+- Actors support have been moved to `actix-web-actors` crate
+
+- Custom Error
+
+  Instead of error_response method alone, ResponseError now provides two methods: error_response and render_response respectively. Where, error_response creates the error response and render_response returns the error response to the caller. 
+
+  Simplest migration from 0.7 to 1.0 shall include below method to the custom implementation of ResponseError:
+
+  ```rust
+  fn render_response(&self) -> HttpResponse {
+    self.error_response()
+  }
+  ```
+
+## 0.7.15
+
+- The `' '` character is not percent decoded anymore before matching routes. If you need to use it in
+  your routes, you should use `%20`.
+
+  instead of
+
+    ```rust
+    fn main() {
+         let app = App::new().resource("/my index", |r| {
+             r.method(http::Method::GET)
+                    .with(index);
+         });
+    }
+    ```
+
+  use
+
+    ```rust
+    fn main() {
+         let app = App::new().resource("/my%20index", |r| {
+             r.method(http::Method::GET)
+                    .with(index);
+         });
+    }
+    ```
+
+- If you used `AsyncResult::async` you need to replace it with `AsyncResult::future`
+
+
+## 0.7.4
+
+- `Route::with_config()`/`Route::with_async_config()` always passes configuration objects as tuple
+  even for handler with one parameter.
+
+
+## 0.7
+
+- `HttpRequest` does not implement `Stream` anymore. If you need to read request payload
+  use `HttpMessage::payload()` method.
+
+  instead of
+
+    ```rust
+    fn index(req: HttpRequest) -> impl Responder {
+         req
+            .from_err()
+            .fold(...)
+            ....
+    }
+    ```
+
+  use `.payload()`
+
+    ```rust
+    fn index(req: HttpRequest) -> impl Responder {
+         req
+            .payload()  // <- get request payload stream
+            .from_err()
+            .fold(...)
+            ....
+    }
+    ```
+
+- [Middleware](https://actix.rs/actix-web/actix_web/middleware/trait.Middleware.html)
+  trait uses `&HttpRequest` instead of `&mut HttpRequest`.
+
+- Removed `Route::with2()` and `Route::with3()` use tuple of extractors instead.
+
+    instead of
+
+    ```rust
+    fn index(query: Query<..>, info: Json<MyStruct) -> impl Responder {}
+    ```
+
+    use tuple of extractors and use `.with()` for registration:
+
+    ```rust
+    fn index((query, json): (Query<..>, Json<MyStruct)) -> impl Responder {}
+    ```
+
+- `Handler::handle()` uses `&self` instead of `&mut self`
+
+- `Handler::handle()` accepts reference to `HttpRequest<_>` instead of value
+
+- Removed deprecated `HttpServer::threads()`, use
+  [HttpServer::workers()](https://actix.rs/actix-web/actix_web/server/struct.HttpServer.html#method.workers) instead.
+
+- Renamed `client::ClientConnectorError::Connector` to
+  `client::ClientConnectorError::Resolver`
+
+- `Route::with()` does not return `ExtractorConfig`, to configure
+  extractor use `Route::with_config()`
+
+    instead of
+
+    ```rust
+    fn main() {
+         let app = App::new().resource("/index.html", |r| {
+             r.method(http::Method::GET)
+                    .with(index)
+                    .limit(4096);  // <- limit size of the payload
+         });
+    }
+    ```
+
+    use
+
+    ```rust
+
+    fn main() {
+         let app = App::new().resource("/index.html", |r| {
+             r.method(http::Method::GET)
+                    .with_config(index, |cfg| { // <- register handler
+                       cfg.limit(4096);  // <- limit size of the payload
+                     })
+         });
+    }
+    ```
+
+- `Route::with_async()` does not return `ExtractorConfig`, to configure
+  extractor use `Route::with_async_config()`
+
+
+## 0.6
+
+- `Path<T>` extractor return `ErrorNotFound` on failure instead of `ErrorBadRequest`
+
+- `ws::Message::Close` now includes optional close reason.
+  `ws::CloseCode::Status` and `ws::CloseCode::Empty` have been removed.
+
+- `HttpServer::threads()` renamed to `HttpServer::workers()`.
+
+- `HttpServer::start_ssl()` and `HttpServer::start_tls()` deprecated.
+  Use `HttpServer::bind_ssl()` and `HttpServer::bind_tls()` instead.
+
+- `HttpRequest::extensions()` returns read only reference to the request's Extension
+  `HttpRequest::extensions_mut()` returns mutable reference.
+
+- Instead of
+
+   `use actix_web::middleware::{
+        CookieSessionBackend, CookieSessionError, RequestSession,
+        Session, SessionBackend, SessionImpl, SessionStorage};`
+
+  use `actix_web::middleware::session`
+
+   `use actix_web::middleware::session{CookieSessionBackend, CookieSessionError,
+        RequestSession, Session, SessionBackend, SessionImpl, SessionStorage};`
+
+- `FromRequest::from_request()` accepts mutable reference to a request
+
+- `FromRequest::Result` has to implement `Into<Reply<Self>>`
+
+- [`Responder::respond_to()`](
+  https://actix.rs/actix-web/actix_web/trait.Responder.html#tymethod.respond_to)
+  is generic over `S`
+
+-  Use `Query` extractor instead of HttpRequest::query()`.
+
+   ```rust
+   fn index(q: Query<HashMap<String, String>>) -> Result<..> {
+       ...
+   }
+   ```
+
+   or
+
+   ```rust
+   let q = Query::<HashMap<String, String>>::extract(req);
+   ```
+
+- Websocket operations are implemented as `WsWriter` trait.
+  you need to use `use actix_web::ws::WsWriter`
+
+
+## 0.5
+
+- `HttpResponseBuilder::body()`, `.finish()`, `.json()`
+   methods return `HttpResponse` instead of `Result<HttpResponse>`
+
+- `actix_web::Method`, `actix_web::StatusCode`, `actix_web::Version`
+   moved to `actix_web::http` module
+
+- `actix_web::header` moved to `actix_web::http::header`
+
+- `NormalizePath` moved to `actix_web::http` module
+
+- `HttpServer` moved to `actix_web::server`, added new `actix_web::server::new()` function,
+  shortcut for `actix_web::server::HttpServer::new()`
+
+- `DefaultHeaders` middleware does not use separate builder, all builder methods moved to type itself
+
+- `StaticFiles::new()`'s show_index parameter removed, use `show_files_listing()` method instead.
+
+- `CookieSessionBackendBuilder` removed, all methods moved to `CookieSessionBackend` type
+
+- `actix_web::httpcodes` module is deprecated, `HttpResponse::Ok()`, `HttpResponse::Found()` and other `HttpResponse::XXX()`
+   functions should be used instead
+
+- `ClientRequestBuilder::body()` returns `Result<_, actix_web::Error>`
+  instead of `Result<_, http::Error>`
+
+- `Application` renamed to a `App`
+
+- `actix_web::Reply`, `actix_web::Resource` moved to `actix_web::dev`

README.md

@@ -1 +0,0 @@
-actix-web/README.md

README.md

@@ -0,0 +1,105 @@
+<div align="center">
+  <h1>Actix Web</h1>
+  <p>
+    <strong>Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust</strong>
+  </p>
+  <p>
+
+[![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
+[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.0.0-rc.1)](https://docs.rs/actix-web/4.0.0-rc.1)
+![MSRV](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)
+![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
+[![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-rc.1/status.svg)](https://deps.rs/crate/actix-web/4.0.0-rc.1)
+<br />
+[![CI](https://github.com/actix/actix-web/actions/workflows/ci.yml/badge.svg)](https://github.com/actix/actix-web/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web)
+![downloads](https://img.shields.io/crates/d/actix-web.svg)
+[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
+
+  </p>
+</div>
+
+## Features
+
+- Supports _HTTP/1.x_ and _HTTP/2_
+- Streaming and pipelining
+- Powerful [request routing](https://actix.rs/docs/url-dispatch/) with optional macros
+- Full [Tokio](https://tokio.rs) compatibility
+- Keep-alive and slow requests handling
+- Client/server [WebSockets](https://actix.rs/docs/websockets/) support
+- Transparent content compression/decompression (br, gzip, deflate, zstd)
+- Multipart streams
+- Static assets
+- SSL support using OpenSSL or Rustls
+- Middlewares ([Logger, Session, CORS, etc](https://actix.rs/docs/middleware/))
+- Includes an async [HTTP client](https://docs.rs/awc/)
+- Runs on stable Rust 1.54+
+
+## Documentation
+
+- [Website & User Guide](https://actix.rs)
+- [Examples Repository](https://github.com/actix/examples)
+- [API Documentation](https://docs.rs/actix-web)
+- [API Documentation (master branch)](https://actix.rs/actix-web/actix_web)
+
+## Example
+
+Dependencies:
+
+```toml
+[dependencies]
+actix-web = "4.0.0-rc.1"
+```
+
+Code:
+
+```rust
+use actix_web::{get, web, App, HttpServer, Responder};
+
+#[get("/{id}/{name}/index.html")]
+async fn index(params: web::Path<(u32, String)>) -> impl Responder {
+    let (id, name) = params.into_inner();
+    format!("Hello {}! id:{}", name, id)
+}
+
+#[actix_web::main] // or #[tokio::main]
+async fn main() -> std::io::Result<()> {
+    HttpServer::new(|| App::new().service(index))
+        .bind(("127.0.0.1", 8080))?
+        .run()
+        .await
+}
+```
+
+### More examples
+
+- [Basic Setup](https://github.com/actix/examples/tree/master/basics/basics/)
+- [Application State](https://github.com/actix/examples/tree/master/basics/state/)
+- [JSON Handling](https://github.com/actix/examples/tree/master/json/json/)
+- [Multipart Streams](https://github.com/actix/examples/tree/master/forms/multipart/)
+- [Diesel Integration](https://github.com/actix/examples/tree/master/database_interactions/diesel/)
+- [r2d2 Integration](https://github.com/actix/examples/tree/master/database_interactions/r2d2/)
+- [Simple WebSocket](https://github.com/actix/examples/tree/master/websockets/websocket/)
+- [Tera Templates](https://github.com/actix/examples/tree/master/template_engines/tera/)
+- [Askama Templates](https://github.com/actix/examples/tree/master/template_engines/askama/)
+- [HTTPS using Rustls](https://github.com/actix/examples/tree/master/security/rustls/)
+- [HTTPS using OpenSSL](https://github.com/actix/examples/tree/master/security/openssl/)
+- [WebSocket Chat](https://github.com/actix/examples/tree/master/websockets/chat/)
+
+You may consider checking out [this directory](https://github.com/actix/examples/tree/master/) for more examples.
+
+## Benchmarks
+
+One of the fastest web frameworks available according to the [TechEmpower Framework Benchmark](https://www.techempower.com/benchmarks/#section=data-r20&test=composite).
+
+## License
+
+This project is licensed under either of the following licenses, at your option:
+
+- Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or [http://www.apache.org/licenses/LICENSE-2.0])
+- MIT license ([LICENSE-MIT](LICENSE-MIT) or [http://opensource.org/licenses/MIT])
+
+## Code of Conduct
+
+Contribution to the actix-web repo is organized under the terms of the Contributor Covenant.
+The Actix team promises to intervene to uphold that code of conduct.

actix-files/CHANGES.md

@@ -1,88 +1,43 @@
 # Changes
 
-## Unreleased
+## Unreleased - 2021-xx-xx
 
-- Minimum supported Rust version (MSRV) is now 1.75.
-
-## 0.6.6
-
-- Update `tokio-uring` dependency to `0.4`.
-- Minimum supported Rust version (MSRV) is now 1.72.
-
-## 0.6.5
-
-- Fix handling of special characters in filenames.
-
-## 0.6.4
-
-- Fix handling of newlines in filenames.
-- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
-
-## 0.6.3
-
-- 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
-
-- Allow partial range responses for video content to start streaming sooner. [#2817]
-- 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
-
-- 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]
-- Minimum supported Rust version (MSRV) is now 1.56 due to transitive `hashbrown` dependency.
-
-[#2021]: https://github.com/actix/actix-web/pull/2021
-[#2645]: https://github.com/actix/actix-web/pull/2645
-
-## 0.6.0
-
-- No significant changes since `0.6.0-beta.16`.
-
-## 0.6.0-beta.16
 
+## 0.6.0-beta.16 - 2022-01-31
 - No significant changes since `0.6.0-beta.15`.
 
-## 0.6.0-beta.15
 
+## 0.6.0-beta.15 - 2022-01-21
 - No significant changes since `0.6.0-beta.14`.
 
-## 0.6.0-beta.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
 
+## 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
 
+## 0.6.0-beta.12 - 2021-12-29
 - No significant changes since `0.6.0-beta.11`.
 
-## 0.6.0-beta.11
 
+## 0.6.0-beta.11 - 2021-12-27
 - No significant changes since `0.6.0-beta.10`.
 
-## 0.6.0-beta.10
 
+## 0.6.0-beta.10 - 2021-12-11
 - No significant changes since `0.6.0-beta.9`.
 
-## 0.6.0-beta.9
 
+## 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]
@@ -93,24 +48,24 @@
 [#2408]: https://github.com/actix/actix-web/pull/2408
 [#2453]: https://github.com/actix/actix-web/pull/2453
 
-## 0.6.0-beta.8
 
+## 0.6.0-beta.8 - 2021-10-20
 - Minimum supported Rust version (MSRV) is now 1.52.
 
-## 0.6.0-beta.7
 
+## 0.6.0-beta.7 - 2021-09-09
 - Minimum supported Rust version (MSRV) is now 1.51.
 
-## 0.6.0-beta.6
 
+## 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
 
+## 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]
@@ -121,58 +76,58 @@
 [#2225]: https://github.com/actix/actix-web/pull/2225
 [#2257]: https://github.com/actix/actix-web/pull/2257
 
-## 0.6.0-beta.4
 
+## 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
 
+## 0.6.0-beta.3 - 2021-03-09
 - No notable changes.
 
-## 0.6.0-beta.2
 
+## 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
 
+## 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
 
+## 0.5.0 - 2020-12-26
 - Optionally support hidden files/directories. [#1811]
 
 [#1811]: https://github.com/actix/actix-web/pull/1811
 
-## 0.4.1
 
+## 0.4.1 - 2020-11-24
 - Clarify order of parameters in `Files::new` and improve docs.
 
-## 0.4.0
 
+## 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
 
+## 0.3.0 - 2020-09-11
 - No significant changes from 0.3.0-beta.1.
 
-## 0.3.0-beta.1
 
+## 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
 
+## 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
@@ -180,73 +135,73 @@
 
 [#1384]: https://github.com/actix/actix-web/pull/1384
 
-## 0.2.1
 
+## 0.2.1 - 2019-12-22
 - Use the same format for file URLs regardless of platforms
 
-## 0.2.0
 
+## 0.2.0 - 2019-12-20
 - Fix BodyEncoding trait import #1220
 
-## 0.2.0-alpha.1
 
+## 0.2.0-alpha.1 - 2019-12-07
 - Migrate to `std::future`
 
-## 0.1.7
 
-- 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
-## 0.1.6
+  `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
 
+## 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
 
+## 0.1.4 - 2019-07-20
 - Allow to disable `Content-Disposition` header #686
 
-## 0.1.3
 
+## 0.1.3 - 2019-06-28
 - Do not set `Content-Length` header, let actix-http set it #930
 
-## 0.1.2
 
+## 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
 
+## 0.1.1 - 2019-06-01
 - Static files are incorrectly served as both chunked and with length #812
 
-## 0.1.0
 
+## 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
 
+## 0.1.0-beta.4 - 2019-05-12
 - Update actix-web to beta.4
 
-## 0.1.0-beta.1
 
+## 0.1.0-beta.1 - 2019-04-20
 - Update actix-web to beta.1
 
-## 0.1.0-alpha.6
 
+## 0.1.0-alpha.6 - 2019-04-14
 - Update actix-web to alpha6
 
-## 0.1.0-alpha.4
 
+## 0.1.0-alpha.4 - 2019-04-08
 - Update actix-web to alpha4
 
-## 0.1.0-alpha.2
 
+## 0.1.0-alpha.2 - 2019-04-02
 - Add default handler support
 
-## 0.1.0-alpha.1
 
+## 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.6"
+version = "0.6.0-beta.16"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
+    "fakeshadow <24548779@qq.com>",
     "Rob Ede <robjtede@icloud.com>",
 ]
 description = "Static file serving for Actix Web"
@@ -11,49 +12,37 @@ homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-web"
 categories = ["asynchronous", "web-programming::http-server"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2018"
 
-[package.metadata.cargo_check_external_types]
+[lib]
-allowed_external_types = [
+name = "actix_files"
-    "actix_http::*",
+path = "src/lib.rs"
-    "actix_service::*",
-    "actix_web::*",
-    "http::*",
-    "mime::*",
-]
 
 [features]
 experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
 
 [dependencies]
-actix-http = "3"
+actix-http = "3.0.0-rc.1"
 actix-service = "2"
 actix-utils = "3"
-actix-web = { version = "4", default-features = false }
+actix-web = { version = "4.0.0-rc.1", default-features = false }
 
-bitflags = "2"
+askama_escape = "0.10"
+bitflags = "1"
 bytes = "1"
-derive_more = { version = "2", features = ["display", "error", "from"] }
+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
+tokio-uring = { version = "0.2", optional = true, features = ["bytes"] }
-[target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.5", optional = true, features = ["bytes"] }
-actix-server = { version = "2.4", optional = true } # ensure matching tokio-uring versions
 
 [dev-dependencies]
-actix-rt = "2.7"
+actix-rt = "2.2"
-actix-test = "0.1"
+actix-test = "0.1.0-beta.12"
-actix-web = "4"
+actix-web = "4.0.0-rc.1"
-env_logger = "0.11"
 tempfile = "3.2"
-
-[lints]
-workspace = true

actix-files/README.md

@@ -1,32 +1,18 @@
-# `actix-files`
+# actix-files
 
-<!-- prettier-ignore-start -->
+> 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.6)](https://docs.rs/actix-files/0.6.6)
+[![Documentation](https://docs.rs/actix-files/badge.svg?version=0.6.0-beta.16)](https://docs.rs/actix-files/0.6.0-beta.16)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![License](https://img.shields.io/crates/l/actix-files.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-files/0.6.6/status.svg)](https://deps.rs/crate/actix-files/0.6.6)
+[![dependency status](https://deps.rs/crate/actix-files/0.6.0-beta.16/status.svg)](https://deps.rs/crate/actix-files/0.6.0-beta.16)
 [![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)
 
-<!-- prettier-ignore-end -->
+## Documentation & Resources
 
-<!-- cargo-rdme start -->
+- [API Documentation](https://docs.rs/actix-files/)
-
+- [Example Project](https://github.com/actix/examples/tree/master/basics/static_index)
-Static file serving for Actix Web.
+- Minimum Supported Rust Version (MSRV): 1.54
-
-Provides a non-blocking service for serving static files from disk.
-
-## Examples
-
-```rust
-use actix_web::App;
-use actix_files::Files;
-
-let app = App::new()
-    .service(Files::new("/static", ".").prefer_utf8(true));
-```
-
-<!-- cargo-rdme end -->

actix-files/examples/guarded-listing.rs

@@ -1,33 +0,0 @@
-use actix_files::Files;
-use actix_web::{get, guard, middleware, App, HttpServer, Responder};
-
-const EXAMPLES_DIR: &str = concat![env!("CARGO_MANIFEST_DIR"), "/examples"];
-
-#[get("/")]
-async fn index() -> impl Responder {
-    "Hello world!"
-}
-
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
-
-    log::info!("starting HTTP server at http://localhost:8080");
-
-    HttpServer::new(|| {
-        App::new()
-            .service(index)
-            .service(
-                Files::new("/assets", EXAMPLES_DIR)
-                    .show_files_listing()
-                    .guard(guard::Header("show-listing", "?1")),
-            )
-            .service(Files::new("/assets", EXAMPLES_DIR))
-            .wrap(middleware::Compress::default())
-            .wrap(middleware::Logger::default())
-    })
-    .bind(("127.0.0.1", 8080))?
-    .workers(2)
-    .run()
-    .await
-}

actix-files/src/chunked.rs

@@ -7,11 +7,12 @@ use std::{
 };
 
 use actix_web::{error::Error, web::Bytes};
-#[cfg(feature = "experimental-io-uring")]
-use bytes::BytesMut;
 use futures_core::{ready, Stream};
 use pin_project_lite::pin_project;
 
+#[cfg(feature = "experimental-io-uring")]
+use bytes::BytesMut;
+
 use super::named::File;
 
 pin_project! {
@@ -80,7 +81,7 @@ async fn chunked_read_file_callback(
 ) -> Result<(File, Bytes), Error> {
     use io::{Read as _, Seek as _};
 
-    let res = actix_web::web::block(move || {
+    let res = actix_web::rt::task::spawn_blocking(move || {
         let mut buf = Vec::with_capacity(max_bytes);
 
         file.seek(io::SeekFrom::Start(offset))?;
@@ -93,7 +94,8 @@ async fn chunked_read_file_callback(
             Ok((file, Bytes::from(buf)))
         }
     })
-    .await??;
+    .await
+    .map_err(|_| actix_web::error::BlockingError)??;
 
     Ok(res)
 }

actix-files/src/directory.rs

@@ -1,13 +1,8 @@
-use std::{
+use std::{fmt::Write, fs::DirEntry, io, path::Path, path::PathBuf};
-    fmt::Write,
-    fs::DirEntry,
-    io,
-    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)]
@@ -64,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)
     };
 }
 
@@ -80,7 +75,7 @@ pub(crate) fn directory_listing(
         if dir.is_visible(&entry) {
             let entry = entry.unwrap();
             let p = match entry.path().strip_prefix(&dir.path) {
-                Ok(p) if cfg!(windows) => base.join(p).to_string_lossy().replace('\\', "/"),
+                Ok(p) if cfg!(windows) => base.join(p).to_string_lossy().replace("\\", "/"),
                 Ok(p) => base.join(p).to_string_lossy().into_owned(),
                 Err(_) => continue,
             };

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("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.
+    /// Cannot render directory
-    #[display("unable to render directory without index file")]
+    #[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.
+    /// The segment started with the wrapped invalid character.
-    #[display("segment started with invalid character: ('{_0}')")]
+    #[display(fmt = "The segment started with the wrapped invalid character")]
     BadStart(char),
 
-    /// Segment contained the wrapped invalid character.
+    /// The segment contained the wrapped invalid character.
-    #[display("segment contained invalid character ('{_0}')")]
+    #[display(fmt = "The segment contained the wrapped invalid character")]
     BadChar(char),
 
-    /// Segment ended with the wrapped invalid character.
+    /// The segment ended with the wrapped invalid character.
-    #[display("segment ended with invalid character: ('{_0}')")]
+    #[display(fmt = "The segment ended with the wrapped invalid character")]
     BadEnd(char),
 
-    /// 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("path is not a valid UTF-8 string after 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

@@ -8,7 +8,8 @@ use std::{
 use actix_service::{boxed, IntoServiceFactory, ServiceFactory, ServiceFactoryExt};
 use actix_web::{
     dev::{
-        AppService, HttpServiceFactory, RequestHead, ResourceDef, ServiceRequest, ServiceResponse,
+        AppService, HttpServiceFactory, RequestHead, ResourceDef, ServiceRequest,
+        ServiceResponse,
     },
     error::Error,
     guard::Guard,
@@ -141,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:
@@ -151,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,
@@ -235,7 +236,7 @@ impl Files {
     /// request starts being handled by the file service, it will not be able to back-out and try
     /// the next service, you will simply get a 404 (or 405) error response.
     ///
-    /// To allow `POST` requests to retrieve files, see [`Files::method_guard()`].
+    /// To allow `POST` requests to retrieve files, see [`Files::use_guards`].
     ///
     /// # Examples
     /// ```
@@ -300,8 +301,12 @@ impl Files {
     pub fn default_handler<F, U>(mut self, f: F) -> Self
     where
         F: IntoServiceFactory<U, ServiceRequest>,
-        U: ServiceFactory<ServiceRequest, Config = (), Response = ServiceResponse, Error = Error>
+        U: ServiceFactory<
-            + 'static,
+                ServiceRequest,
+                Config = (),
+                Response = ServiceResponse,
+                Error = Error,
+            > + 'static,
     {
         // create and configure default resource
         self.default = Rc::new(RefCell::new(Some(Rc::new(boxed::factory(
@@ -385,46 +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;
-        let body_str = std::str::from_utf8(&body).unwrap();
-        let actual_path = Path::new(&body_str);
-        let expected_path = Path::new("actix-files/tests");
-        assert!(
-            actual_path.ends_with(expected_path),
-            "body {:?} does not end with {:?}",
-            actual_path,
-            expected_path
-        );
-    }
-}

actix-files/src/lib.rs

@@ -11,12 +11,8 @@
 //!     .service(Files::new("/static", ".").prefer_utf8(true));
 //! ```
 
-#![warn(missing_docs, missing_debug_implementations)]
+#![deny(rust_2018_idioms, nonstandard_style)]
-#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
+#![warn(future_incompatible, missing_docs, missing_debug_implementations)]
-#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
-
-use std::path::Path;
 
 use actix_service::boxed::{BoxService, BoxServiceFactory};
 use actix_web::{
@@ -25,6 +21,7 @@ use actix_web::{
     http::header::DispositionType,
 };
 use mime_guess::from_ext;
+use std::path::Path;
 
 mod chunked;
 mod directory;
@@ -36,15 +33,16 @@ mod path_buf;
 mod range;
 mod service;
 
-pub use self::{
+pub use self::chunked::ChunkedReadFile;
-    chunked::ChunkedReadFile, directory::Directory, files::Files, named::NamedFile,
+pub use self::directory::Directory;
-    range::HttpRange, service::FilesService,
+pub use self::files::Files;
-};
+pub use self::named::NamedFile;
-use self::{
+pub use self::range::HttpRange;
-    directory::{directory_listing, DirectoryRenderer},
+pub use self::service::FilesService;
-    error::FilesError,
+
-    path_buf::PathBufWrap,
+use self::directory::{directory_listing, DirectoryRenderer};
-};
+use self::error::FilesError;
+use self::path_buf::PathBufWrap;
 
 type HttpService = BoxService<ServiceRequest, ServiceResponse, Error>;
 type HttpNewService = BoxServiceFactory<(), ServiceRequest, ServiceResponse, Error, ()>;
@@ -64,7 +62,6 @@ type PathFilter = dyn Fn(&Path, &RequestHead) -> bool;
 #[cfg(test)]
 mod tests {
     use std::{
-        fmt::Write as _,
         fs::{self},
         ops::Add,
         time::{Duration, SystemTime},
@@ -74,7 +71,7 @@ mod tests {
         dev::ServiceFactory,
         guard,
         http::{
-            header::{self, ContentDisposition, DispositionParam},
+            header::{self, ContentDisposition, DispositionParam, DispositionType},
             Method, StatusCode,
         },
         middleware::Compress,
@@ -306,11 +303,11 @@ mod tests {
         let resp = file.respond_to(&req);
         assert_eq!(
             resp.headers().get(header::CONTENT_TYPE).unwrap(),
-            "text/javascript",
+            "application/javascript; charset=utf-8"
         );
         assert_eq!(
             resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
-            "inline; filename=\"test.js\"",
+            "inline; filename=\"test.js\""
         );
     }
 
@@ -367,43 +364,20 @@ mod tests {
         );
     }
 
-    #[allow(deprecated)]
     #[actix_rt::test]
-    async fn status_code_customize_same_output() {
+    async fn test_named_file_status_code_text() {
-        let file1 = NamedFile::open_async("Cargo.toml")
+        let mut file = NamedFile::open_async("Cargo.toml")
             .await
             .unwrap()
             .set_status_code(StatusCode::NOT_FOUND);
-
-        let file2 = NamedFile::open_async("Cargo.toml")
-            .await
-            .unwrap()
-            .customize()
-            .with_status(StatusCode::NOT_FOUND);
-
-        let req = TestRequest::default().to_http_request();
-        let res1 = file1.respond_to(&req);
-        let res2 = file2.respond_to(&req);
-
-        assert_eq!(res1.status(), StatusCode::NOT_FOUND);
-        assert_eq!(res2.status(), StatusCode::NOT_FOUND);
-    }
-
-    #[actix_rt::test]
-    async fn test_named_file_status_code_text() {
-        let mut file = NamedFile::open_async("Cargo.toml").await.unwrap();
-
         {
             file.file();
             let _f: &File = &file;
         }
-
         {
             let _f: &mut File = &mut file;
         }
 
-        let file = file.customize().with_status(StatusCode::NOT_FOUND);
-
         let req = TestRequest::default().to_http_request();
         let resp = file.respond_to(&req);
         assert_eq!(
@@ -553,9 +527,10 @@ mod tests {
 
     #[actix_rt::test]
     async fn test_static_files_with_spaces() {
-        let srv =
+        let srv = test::init_service(
-            test::init_service(App::new().service(Files::new("/", ".").index_file("Cargo.toml")))
+            App::new().service(Files::new("/", ".").index_file("Cargo.toml")),
-                .await;
+        )
+        .await;
         let request = TestRequest::get()
             .uri("/tests/test%20space.binary")
             .to_request();
@@ -567,30 +542,6 @@ mod tests {
         assert_eq!(bytes, data);
     }
 
-    #[cfg(not(target_os = "windows"))]
-    #[actix_rt::test]
-    async fn test_static_files_with_special_characters() {
-        // Create the file we want to test against ad-hoc. We can't check it in as otherwise
-        // Windows can't even checkout this repository.
-        let temp_dir = tempfile::tempdir().unwrap();
-        let file_with_newlines = temp_dir.path().join("test\n\x0B\x0C\rnewline.text");
-        fs::write(&file_with_newlines, "Look at my newlines").unwrap();
-
-        let srv = test::init_service(
-            App::new().service(Files::new("/", temp_dir.path()).index_file("Cargo.toml")),
-        )
-        .await;
-        let request = TestRequest::get()
-            .uri("/test%0A%0B%0C%0Dnewline.text")
-            .to_request();
-        let response = test::call_service(&srv, request).await;
-        assert_eq!(response.status(), StatusCode::OK);
-
-        let bytes = test::read_body(response).await;
-        let data = web::Bytes::from(fs::read(file_with_newlines).unwrap());
-        assert_eq!(bytes, data);
-    }
-
     #[actix_rt::test]
     async fn test_files_not_allowed() {
         let srv = test::init_service(App::new().service(Files::new("/", "."))).await;
@@ -689,7 +640,8 @@ mod tests {
     #[actix_rt::test]
     async fn test_static_files() {
         let srv =
-            test::init_service(App::new().service(Files::new("/", ".").show_files_listing())).await;
+            test::init_service(App::new().service(Files::new("/", ".").show_files_listing()))
+                .await;
         let req = TestRequest::with_uri("/missing").to_request();
 
         let resp = test::call_service(&srv, req).await;
@@ -702,7 +654,8 @@ mod tests {
         assert_eq!(resp.status(), StatusCode::NOT_FOUND);
 
         let srv =
-            test::init_service(App::new().service(Files::new("/", ".").show_files_listing())).await;
+            test::init_service(App::new().service(Files::new("/", ".").show_files_listing()))
+                .await;
         let req = TestRequest::with_uri("/tests").to_request();
         let resp = test::call_service(&srv, req).await;
         assert_eq!(
@@ -863,21 +816,19 @@ mod tests {
 
     #[actix_rt::test]
     async fn test_percent_encoding_2() {
-        let temp_dir = tempfile::tempdir().unwrap();
+        let tmpdir = tempfile::tempdir().unwrap();
         let filename = match cfg!(unix) {
-            true => "ض:?#[]{}<>()@!$&'`|*+,;= %20\n.test",
+            true => "ض:?#[]{}<>()@!$&'`|*+,;= %20.test",
             false => "ض#[]{}()@!$&'`+,;= %20.test",
         };
         let filename_encoded = filename
             .as_bytes()
             .iter()
-            .fold(String::new(), |mut buf, c| {
+            .map(|c| format!("%{:02X}", c))
-                write!(&mut buf, "%{:02X}", c).unwrap();
+            .collect::<String>();
-                buf
+        std::fs::File::create(tmpdir.path().join(filename)).unwrap();
-            });
-        std::fs::File::create(temp_dir.path().join(filename)).unwrap();
 
-        let srv = test::init_service(App::new().service(Files::new("/", temp_dir.path()))).await;
+        let srv = test::init_service(App::new().service(Files::new("", tmpdir.path()))).await;
 
         let req = TestRequest::get()
             .uri(&format!("/{}", filename_encoded))

actix-files/src/named.rs

@@ -8,13 +8,13 @@ use std::{
 use actix_web::{
     body::{self, BoxBody, SizedStream},
     dev::{
-        self, AppService, HttpServiceFactory, ResourceDef, Service, ServiceFactory, ServiceRequest,
+        self, AppService, HttpServiceFactory, ResourceDef, Service, ServiceFactory,
-        ServiceResponse,
+        ServiceRequest, ServiceResponse,
     },
     http::{
         header::{
-            self, Charset, ContentDisposition, ContentEncoding, DispositionParam, DispositionType,
+            self, Charset, ContentDisposition, ContentEncoding, DispositionParam,
-            ExtendedValue, HeaderValue,
+            DispositionType, ExtendedValue, HeaderValue,
         },
         StatusCode,
     },
@@ -23,12 +23,11 @@ use actix_web::{
 use bitflags::bitflags;
 use derive_more::{Deref, DerefMut};
 use futures_core::future::LocalBoxFuture;
-use mime::Mime;
+use mime_guess::from_path;
 
 use crate::{encoding::equiv_utf8_text, range::HttpRange};
 
 bitflags! {
-    #[derive(Debug, Clone, Copy)]
     pub(crate) struct Flags: u8 {
         const ETAG =                0b0000_0001;
         const LAST_MD =             0b0000_0010;
@@ -77,14 +76,13 @@ pub struct NamedFile {
     pub(crate) md: Metadata,
     pub(crate) flags: Flags,
     pub(crate) status_code: StatusCode,
-    pub(crate) content_type: Mime,
+    pub(crate) content_type: mime::Mime,
-    pub(crate) content_disposition: ContentDisposition,
+    pub(crate) content_disposition: header::ContentDisposition,
     pub(crate) encoding: Option<ContentEncoding>,
 }
 
 #[cfg(not(feature = "experimental-io-uring"))]
 pub(crate) use std::fs::File;
-
 #[cfg(feature = "experimental-io-uring")]
 pub(crate) use tokio_uring::fs::File;
 
@@ -98,18 +96,18 @@ impl NamedFile {
     ///
     /// # Examples
     /// ```ignore
-    /// use std::{
-    ///     io::{self, Write as _},
-    ///     env,
-    ///     fs::File
-    /// };
     /// use actix_files::NamedFile;
+    /// use std::io::{self, Write};
+    /// use std::env;
+    /// use std::fs::File;
     ///
-    /// let mut file = File::create("foo.txt")?;
+    /// fn main() -> io::Result<()> {
-    /// file.write_all(b"Hello, world!")?;
+    ///     let mut file = File::create("foo.txt")?;
-    /// let named_file = NamedFile::from_file(file, "bar.txt")?;
+    ///     file.write_all(b"Hello, world!")?;
-    /// # std::fs::remove_file("foo.txt");
+    ///     let named_file = NamedFile::from_file(file, "bar.txt")?;
-    /// Ok(())
+    ///     # std::fs::remove_file("foo.txt");
+    ///     Ok(())
+    /// }
     /// ```
     pub fn from_file<P: AsRef<Path>>(file: File, path: P) -> io::Result<NamedFile> {
         let path = path.as_ref().to_path_buf();
@@ -127,25 +125,20 @@ impl NamedFile {
                 }
             };
 
-            let ct = mime_guess::from_path(&path).first_or_octet_stream();
+            let ct = from_path(&path).first_or_octet_stream();
 
             let disposition = match ct.type_() {
-                mime::IMAGE | mime::TEXT | mime::AUDIO | mime::VIDEO => DispositionType::Inline,
+                mime::IMAGE | mime::TEXT | 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,
             };
 
-            // replace special characters in filenames which could occur on some filesystems
+            let mut parameters =
-            let filename_s = filename
+                vec![DispositionParam::Filename(String::from(filename.as_ref()))];
-                .replace('\n', "%0A") // \n line break
-                .replace('\x0B', "%0B") // \v vertical tab
-                .replace('\x0C', "%0C") // \f form feed
-                .replace('\r', "%0D"); // \r carriage return
-            let mut parameters = vec![DispositionParam::Filename(filename_s)];
 
             if !filename.is_ascii() {
                 parameters.push(DispositionParam::FilenameExt(ExtendedValue {
@@ -216,10 +209,11 @@ impl NamedFile {
         Self::from_file(file, path)
     }
 
+    #[allow(rustdoc::broken_intra_doc_links)]
     /// Attempts to open a file asynchronously in read-only mode.
     ///
-    /// When the `experimental-io-uring` crate feature is enabled, this will be async. Otherwise, it
+    /// When the `experimental-io-uring` crate feature is enabled, this will be async.
-    /// will behave just like `open`.
+    /// Otherwise, it will be just like [`open`][Self::open].
     ///
     /// # Examples
     /// ```
@@ -244,13 +238,13 @@ impl NamedFile {
         Self::from_file(file, path)
     }
 
-    /// Returns reference to the underlying file object.
+    /// Returns reference to the underlying `File` object.
     #[inline]
     pub fn file(&self) -> &File {
         &self.file
     }
 
-    /// Returns the filesystem path to this file.
+    /// Retrieve the path of this file.
     ///
     /// # Examples
     /// ```
@@ -268,53 +262,16 @@ impl NamedFile {
         self.path.as_path()
     }
 
-    /// Returns the time the file was last modified.
+    /// Set response **Status Code**
-    ///
-    /// Returns `None` only on unsupported platforms; see [`std::fs::Metadata::modified()`].
-    /// Therefore, it is usually safe to unwrap this.
-    #[inline]
-    pub fn modified(&self) -> Option<SystemTime> {
-        self.modified
-    }
-
-    /// Returns the filesystem metadata associated with this file.
-    #[inline]
-    pub fn metadata(&self) -> &Metadata {
-        &self.md
-    }
-
-    /// Returns the `Content-Type` header that will be used when serving this file.
-    #[inline]
-    pub fn content_type(&self) -> &Mime {
-        &self.content_type
-    }
-
-    /// Returns the `Content-Disposition` that will be used when serving this file.
-    #[inline]
-    pub fn content_disposition(&self) -> &ContentDisposition {
-        &self.content_disposition
-    }
-
-    /// Returns the `Content-Encoding` that will be used when serving this file.
-    ///
-    /// A return value of `None` indicates that the content is not already using a compressed
-    /// representation and may be subject to compression downstream.
-    #[inline]
-    pub fn content_encoding(&self) -> Option<ContentEncoding> {
-        self.encoding
-    }
-
-    /// Set response status code.
-    #[deprecated(since = "0.7.0", note = "Prefer `Responder::customize()`.")]
     pub fn set_status_code(mut self, status: StatusCode) -> Self {
         self.status_code = status;
         self
     }
 
-    /// Sets the `Content-Type` header that will be used when serving this file. By default the
+    /// Set the MIME Content-Type for serving this file. By default the Content-Type is inferred
-    /// `Content-Type` is inferred from the filename extension.
+    /// from the filename extension.
     #[inline]
-    pub fn set_content_type(mut self, mime_type: Mime) -> Self {
+    pub fn set_content_type(mut self, mime_type: mime::Mime) -> Self {
         self.content_type = mime_type;
         self
     }
@@ -327,15 +284,15 @@ impl NamedFile {
     /// filename is taken from the path provided in the `open` method after converting it to UTF-8
     /// (using `to_string_lossy`).
     #[inline]
-    pub fn set_content_disposition(mut self, cd: ContentDisposition) -> Self {
+    pub fn set_content_disposition(mut self, cd: header::ContentDisposition) -> Self {
         self.content_disposition = cd;
         self.flags.insert(Flags::CONTENT_DISPOSITION);
         self
     }
 
-    /// Disables `Content-Disposition` header.
+    /// Disable `Content-Disposition` header.
     ///
-    /// By default, the `Content-Disposition` header is sent.
+    /// By default Content-Disposition` header is enabled.
     #[inline]
     pub fn disable_content_disposition(mut self) -> Self {
         self.flags.remove(Flags::CONTENT_DISPOSITION);
@@ -534,26 +491,11 @@ impl NamedFile {
                     length = ranges[0].length;
                     offset = ranges[0].start;
 
-                    // When a Content-Encoding header is present in a 206 partial content response
+                    // don't allow compression middleware to modify partial content
-                    // for video content, it prevents browser video players from starting playback
+                    res.insert_header((
-                    // before loading the whole video and also prevents seeking.
+                        header::CONTENT_ENCODING,
-                    //
+                        HeaderValue::from_static("identity"),
-                    // 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"),
-                        ));
-                    }
 
                     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)?;
@@ -97,6 +97,8 @@ impl FromRequest for PathBufWrap {
 
 #[cfg(test)]
 mod tests {
+    use std::iter::FromIterator;
+
     use super::*;
 
     #[test]

actix-files/src/range.rs

@@ -1,36 +1,4 @@
-use std::fmt;
+use derive_more::{Display, Error};
-
-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",
-        })
-    }
-}
 
 /// 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 =
+        match http_range::HttpRange::parse(header, size) {
-            http_range::HttpRange::parse(header, size).map_err(|err| ParseRangeErr(err.into()))?;
+            Ok(ranges) => Ok(ranges
-
+                .iter()
-        Ok(ranges
+                .map(|range| HttpRange {
-            .iter()
+                    start: range.start,
-            .map(|range| HttpRange {
+                    length: range.length,
-                start: range.start,
+                })
-                length: range.length,
+                .collect()),
-            })
+            Err(_) => Err(ParseRangeErr(())),
-            .collect())
+        }
     }
 }
 

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
     }
 }
 
@@ -62,7 +62,11 @@ impl FilesService {
         }
     }
 
-    fn serve_named_file(&self, req: ServiceRequest, mut named_file: NamedFile) -> ServiceResponse {
+    fn serve_named_file(
+        &self,
+        req: ServiceRequest,
+        mut named_file: NamedFile,
+    ) -> ServiceResponse {
         if let Some(ref mime_override) = self.mime_override {
             let new_disposition = mime_override(&named_file.content_type.type_());
             named_file.content_disposition.disposition = new_disposition;
@@ -79,7 +83,7 @@ impl FilesService {
 
         let (req, _) = req.into_parts();
 
-        (self.renderer)(&dir, &req).unwrap_or_else(|err| ServiceResponse::from_err(err, req))
+        (self.renderer)(&dir, &req).unwrap_or_else(|e| ServiceResponse::from_err(e, req))
     }
 }
 
@@ -116,11 +120,13 @@ impl Service<ServiceRequest> for FilesService {
                 ));
             }
 
-            let path_on_disk =
+            let path_on_disk = match PathBufWrap::parse_path(
-                match PathBufWrap::parse_path(req.match_info().unprocessed(), this.hidden_files) {
+                req.match_info().unprocessed(),
-                    Ok(item) => item,
+                this.hidden_files,
-                    Err(err) => return Ok(req.error_response(err)),
+            ) {
-                };
+                Ok(item) => item,
+                Err(err) => return Ok(req.error_response(err)),
+            };
 
             if let Some(filter) = &this.path_filter {
                 if !filter(path_on_disk.as_ref(), req.head()) {
@@ -171,7 +177,8 @@ impl Service<ServiceRequest> for FilesService {
                 match NamedFile::open_async(&path).await {
                     Ok(mut named_file) => {
                         if let Some(ref mime_override) = this.mime_override {
-                            let new_disposition = mime_override(&named_file.content_type.type_());
+                            let new_disposition =
+                                mime_override(&named_file.content_type.type_());
                             named_file.content_disposition.disposition = new_disposition;
                         }
                         named_file.flags = this.file_flags;

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]
@@ -24,7 +24,8 @@ async fn test_utf8_file_contents() {
 
     // disable UTF-8 attribute
     let srv =
-        test::init_service(App::new().service(Files::new("/", "./tests").prefer_utf8(false))).await;
+        test::init_service(App::new().service(Files::new("/", "./tests").prefer_utf8(false)))
+            .await;
 
     let req = TestRequest::with_uri("/utf8.txt").to_request();
     let res = test::call_service(&srv, req).await;
@@ -35,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-files/tests/guard.rs

@@ -12,7 +12,9 @@ async fn test_guard_filter() {
     let srv = test::init_service(
         App::new()
             .service(Files::new("/", "./tests/fixtures/guards/first").guard(Host("first.com")))
-            .service(Files::new("/", "./tests/fixtures/guards/second").guard(Host("second.com"))),
+            .service(
+                Files::new("/", "./tests/fixtures/guards/second").guard(Host("second.com")),
+            ),
     )
     .await;
 

actix-files/tests/traversal.rs

@@ -9,7 +9,8 @@ use actix_web::{
 async fn test_directory_traversal_prevention() {
     let srv = test::init_service(App::new().service(Files::new("/", "./tests"))).await;
 
-    let req = TestRequest::with_uri("/../../../../../../../../../../../etc/passwd").to_request();
+    let req =
+        TestRequest::with_uri("/../../../../../../../../../../../etc/passwd").to_request();
     let res = test::call_service(&srv, req).await;
     assert_eq!(res.status(), StatusCode::NOT_FOUND);
 

actix-http-test/CHANGES.md

@@ -1,103 +1,71 @@
 # Changes
 
-## Unreleased
+## Unreleased - 2021-xx-xx
 
-- Minimum supported Rust version (MSRV) is now 1.72.
-
-## 3.2.0
-
-- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
-
-## 3.1.0
-
-- Minimum supported Rust version (MSRV) is now 1.59.
-
-## 3.0.0
-
-- `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
-
-- No significant changes since `3.0.0-beta.12`.
-
-## 3.0.0-beta.12
 
+## 3.0.0-beta.12 - 2022-01-31
 - No significant changes since `3.0.0-beta.11`.
 
-## 3.0.0-beta.11
 
+## 3.0.0-beta.11 - 2022-01-04
 - Minimum supported Rust version (MSRV) is now 1.54.
 
-## 3.0.0-beta.10
 
+## 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
 
+## 3.0.0-beta.9 - 2021-12-11
 - No significant changes since `3.0.0-beta.8`.
 
-## 3.0.0-beta.8
 
+## 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
 
+## 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
 
+## 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
 
+## 3.0.0-beta.5 - 2021-09-09
 - Minimum supported Rust version (MSRV) is now 1.51.
 
-## 3.0.0-beta.4
 
+## 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
 
+## 3.0.0-beta.3 - 2021-03-09
 - No notable changes.
 
-## 3.0.0-beta.2
 
+## 3.0.0-beta.2 - 2021-02-10
 - No notable changes.
 
-## 3.0.0-beta.1
 
+## 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
 
+## 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]
@@ -105,12 +73,12 @@
 [#1773]: https://github.com/actix/actix-web/pull/1773
 [#1645]: https://github.com/actix/actix-web/pull/1645
 
-## 2.0.0
 
+## 2.0.0 - 2020-09-11
 - Update actix-codec and actix-utils dependencies.
 
-## 2.0.0-alpha.1
 
+## 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.
@@ -119,57 +87,56 @@
 - Update `base64` dependency to 0.12
 - Update `env_logger` dependency to 0.7
 
-## 1.0.0
+## 1.0.0 - 2019-12-13
-
 - Replaced `TestServer::start()` with `test_server()`
 
-## 1.0.0-alpha.3
 
+## 1.0.0-alpha.3 - 2019-12-07
 - Migrate to `std::future`
 
-## 0.2.5
 
+## 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
 
+## 0.2.4 - 2019-07-18
 - Update actix-server to 0.6
 
-## 0.2.3
 
+## 0.2.3 - 2019-07-16
 - Add `delete`, `options`, `patch` methods to `TestServerRunner`
 
-## 0.2.2
 
+## 0.2.2 - 2019-06-16
 - Add .put() and .sput() methods
 
-## 0.2.1
 
+## 0.2.1 - 2019-06-05
 - Add license files
 
-## 0.2.0
 
+## 0.2.0 - 2019-05-12
 - Update awc and actix-http deps
 
-## 0.1.1
 
+## 0.1.1 - 2019-04-24
 - Always make new connection for http client
 
-## 0.1.0
 
+## 0.1.0 - 2019-04-16
 - No changes
 
-## 0.1.0-alpha.3
 
+## 0.1.0-alpha.3 - 2019-04-02
 - Request functions accept path #743
 
-## 0.1.0-alpha.2
 
+## 0.1.0-alpha.2 - 2019-03-29
 - Added TestServerRuntime::load_body() method
 - Update actix-http and awc libraries
 
-## 0.1.0-alpha.1
 
+## 0.1.0-alpha.1 - 2019-03-28
 - Initial impl

actix-http-test/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "actix-http-test"
-version = "3.2.0"
+version = "3.0.0-beta.12"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Various helpers for Actix applications to use during testing"
 keywords = ["http", "web", "framework", "async", "futures"]
 homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-web"
+repository = "https://github.com/actix/actix-web.git"
 categories = [
     "network-programming",
     "asynchronous",
@@ -13,22 +13,14 @@ categories = [
     "web-programming::websocket",
 ]
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2018"
 
 [package.metadata.docs.rs]
 features = []
 
-[package.metadata.cargo_check_external_types]
+[lib]
-allowed_external_types = [
+name = "actix_http_test"
-    "actix_codec::*",
+path = "src/lib.rs"
-    "actix_http::*",
-    "actix_server::*",
-    "awc::*",
-    "bytes::*",
-    "futures_core::*",
-    "http::*",
-    "tokio::*",
-]
 
 [features]
 default = []
@@ -37,28 +29,27 @@ default = []
 openssl = ["tls-openssl", "awc/openssl"]
 
 [dependencies]
-actix-service = "2"
+actix-service = "2.0.0"
-actix-codec = "0.5"
+actix-codec = "0.4.1"
-actix-tls = "3"
+actix-tls = "3.0.0"
-actix-utils = "3"
+actix-utils = "3.0.0"
 actix-rt = "2.2"
 actix-server = "2"
-awc = { version = "3", default-features = false }
+awc = { version = "3.0.0-beta.20", default-features = false }
 
+base64 = "0.13"
 bytes = "1"
-futures-core = { version = "0.3.17", default-features = false }
+futures-core = { version = "0.3.7", default-features = false }
-http = "0.2.7"
+http = "0.2.5"
 log = "0.4"
-socket2 = "0.5"
+socket2 = "0.4"
-serde = "1"
+serde = "1.0"
-serde_json = "1"
+serde_json = "1.0"
 slab = "0.4"
 serde_urlencoded = "0.7"
-tls-openssl = { version = "0.10.55", package = "openssl", optional = true }
+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-http = "3"
+actix-web = { version = "4.0.0-rc.1", default-features = false, features = ["cookies"] }
-
+actix-http = "3.0.0-rc.1"
-[lints]
-workspace = true

actix-http-test/README.md

@@ -1,20 +1,17 @@
-# `actix-http-test`
+# actix-http-test
 
-<!-- prettier-ignore-start -->
+> 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.2.0)](https://docs.rs/actix-http-test/3.2.0)
+[![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.0.0-beta.12)](https://docs.rs/actix-http-test/3.0.0-beta.12)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![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.2.0/status.svg)](https://deps.rs/crate/actix-http-test/3.2.0)
+[![Dependency Status](https://deps.rs/crate/actix-http-test/3.0.0-beta.12/status.svg)](https://deps.rs/crate/actix-http-test/3.0.0-beta.12)
 [![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)
 
-<!-- prettier-ignore-end -->
+## Documentation & Resources
 
-<!-- cargo-rdme start -->
+- [API Documentation](https://docs.rs/actix-http-test)
-
+- Minimum Supported Rust Version (MSRV): 1.54
-Various helpers for Actix applications to use during testing.
-
-<!-- cargo-rdme end -->

actix-http-test/src/lib.rs

@@ -1,8 +1,9 @@
 //! Various helpers for Actix applications to use during testing.
 
+#![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))]
 
 #[cfg(feature = "openssl")]
 extern crate tls_openssl as openssl;
@@ -28,31 +29,27 @@ use tokio::sync::mpsc;
 /// for HTTP applications.
 ///
 /// # Examples
-///
+/// ```no_run
-/// ```
+/// use actix_http::HttpService;
-/// use actix_http::{HttpService, Response, Error, StatusCode};
 /// use actix_http_test::test_server;
-/// use actix_service::{fn_service, map_config, ServiceFactoryExt as _};
+/// use actix_web::{web, App, HttpResponse, Error};
 ///
-/// #[actix_rt::test]
+/// async fn my_handler() -> Result<HttpResponse, Error> {
-/// # async fn hidden_test() {}
+///     Ok(HttpResponse::Ok().into())
+/// }
+///
+/// #[actix_web::test]
 /// async fn test_example() {
-///     let srv = test_server(|| {
+///     let mut srv = TestServer::start(||
-///         HttpService::build()
+///         HttpService::new(
-///             .h1(fn_service(|req| async move {
+///             App::new().service(web::resource("/").to(my_handler))
-///                 Ok::<_, Error>(Response::ok())
+///         )
-///             }))
+///     );
-///             .tcp()
-///             .map_err(|_| ())
-///     })
-///     .await;
 ///
 ///     let req = srv.get("/");
 ///     let response = req.send().await.unwrap();
-///
+///     assert!(response.status().is_success());
-///     assert_eq!(response.status(), StatusCode::OK);
 /// }
-/// # actix_rt::System::new().block_on(test_example());
 /// ```
 pub async fn test_server<F: ServerServiceFactory<TcpStream>>(factory: F) -> TestServer {
     let tcp = net::TcpListener::bind("127.0.0.1:0").unwrap();
@@ -90,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(());
     });
 
@@ -106,7 +102,7 @@ pub async fn test_server_with_addr<F: ServerServiceFactory<TcpStream>>(
             builder.set_verify(SslVerifyMode::NONE);
             let _ = builder
                 .set_alpn_protos(b"\x02h2\x08http/1.1")
-                .map_err(|err| log::error!("Can not set ALPN protocol: {err}"));
+                .map_err(|e| log::error!("Can not set alpn protocol: {:?}", e));
 
             Connector::new()
                 .conn_lifetime(Duration::from_secs(0))
@@ -298,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,188 +1,139 @@
 [package]
 name = "actix-http"
-version = "3.10.0"
+version = "3.0.0-rc.1"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Rob Ede <robjtede@icloud.com>",
 ]
-description = "HTTP types and services for the Actix ecosystem"
+description = "HTTP primitives for the Actix ecosystem"
 keywords = ["actix", "http", "framework", "async", "futures"]
 homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-web"
+repository = "https://github.com/actix/actix-web.git"
 categories = [
     "network-programming",
     "asynchronous",
     "web-programming::http-server",
     "web-programming::websocket",
 ]
-license.workspace = true
+license = "MIT OR Apache-2.0"
-edition.workspace = true
+edition = "2018"
-rust-version.workspace = true
 
 [package.metadata.docs.rs]
-rustdoc-args = ["--cfg", "docsrs"]
+# features that docs.rs will build with
-features = [
+features = ["openssl", "rustls", "compress-brotli", "compress-gzip", "compress-zstd"]
-    "http2",
-    "ws",
-    "openssl",
-    "rustls-0_20",
-    "rustls-0_21",
-    "rustls-0_22",
-    "rustls-0_23",
-    "compress-brotli",
-    "compress-gzip",
-    "compress-zstd",
-]
 
-[package.metadata.cargo_check_external_types]
+[lib]
-allowed_external_types = [
+name = "actix_http"
-    "actix_codec::*",
+path = "src/lib.rs"
-    "actix_service::*",
-    "actix_tls::*",
-    "actix_utils::*",
-    "bytes::*",
-    "bytestring::*",
-    "encoding_rs::*",
-    "futures_core::*",
-    "h2::*",
-    "http::*",
-    "httparse::*",
-    "language_tags::*",
-    "mime::*",
-    "openssl::*",
-    "rustls::*",
-    "tokio_util::*",
-    "tokio::*",
-]
 
 [features]
 default = []
 
 # HTTP/2 protocol support
-http2 = ["dep:h2"]
+http2 = ["h2"]
 
 # WebSocket protocol implementation
 ws = [
-    "dep:local-channel",
+    "local-channel",
-    "dep:base64",
+    "base64",
-    "dep:rand",
+    "rand",
-    "dep:sha1",
+    "sha-1",
 ]
 
 # TLS via OpenSSL
-openssl = ["__tls", "actix-tls/accept", "actix-tls/openssl"]
+openssl = ["actix-tls/accept", "actix-tls/openssl"]
 
-# TLS via Rustls v0.20
+# TLS via Rustls
-rustls = ["__tls", "rustls-0_20"]
+rustls = ["actix-tls/accept", "actix-tls/rustls"]
-
-# TLS via Rustls v0.20
-rustls-0_20 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_20"]
-
-# TLS via Rustls v0.21
-rustls-0_21 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_21"]
-
-# TLS via Rustls v0.22
-rustls-0_22 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_22"]
-
-# TLS via Rustls v0.23
-rustls-0_23 = ["__tls", "actix-tls/accept", "actix-tls/rustls-0_23"]
 
 # Compression codecs
-compress-brotli = ["__compress", "dep:brotli"]
+compress-brotli = ["__compress", "brotli"]
-compress-gzip   = ["__compress", "dep:flate2"]
+compress-gzip   = ["__compress", "flate2"]
-compress-zstd   = ["__compress", "dep:zstd"]
+compress-zstd   = ["__compress", "zstd"]
 
-# Internal (PRIVATE!) features used to aid testing and checking feature status.
+# Internal (PRIVATE!) features used to aid testing and cheking feature status.
 # Don't rely on these whatsoever. They are semver-exempt and may disappear at anytime.
 __compress = []
 
-# Internal (PRIVATE!) features used to aid checking feature status.
-# Don't rely on these whatsoever. They may disappear at anytime.
-__tls = []
-
 [dependencies]
 actix-service = "2"
-actix-codec = "0.5"
+actix-codec = "0.4.1"
 actix-utils = "3"
 actix-rt = { version = "2.2", default-features = false }
 
-bitflags = "2"
+ahash = "0.7"
+bitflags = "1.2"
 bytes = "1"
 bytestring = "1"
-derive_more = { version = "2", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] }
+derive_more = "0.99.5"
 encoding_rs = "0.8"
-foldhash = "0.1"
+futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
-futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
+http = "0.2.5"
-http = "0.2.7"
 httparse = "1.5.1"
 httpdate = "1.0.1"
 itoa = "1"
 language-tags = "0.3"
-mime = "0.3.4"
+log = "0.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
-h2 = { version = "0.3.26", optional = true }
+h2 = { version = "0.3.9", optional = true }
 
 # websockets
 local-channel = { version = "0.1", optional = true }
-base64 = { version = "0.22", optional = true }
+base64 = { version = "0.13", optional = true }
-rand = { version = "0.9", optional = true }
+rand = { version = "0.8", optional = true }
-sha1 = { version = "0.10", optional = true }
+sha-1 = { version = "0.10", optional = true }
 
 # openssl/rustls
-actix-tls = { version = "3.4", default-features = false, optional = true }
+actix-tls = { version = "3.0.0", default-features = false, optional = true }
 
 # compress-*
-brotli = { version = "7", optional = true }
+brotli = { version = "3.3.3", optional = true }
 flate2 = { version = "1.0.13", optional = true }
-zstd = { version = "0.13", optional = true }
+zstd = { version = "0.9", optional = true }
 
 [dev-dependencies]
-actix-http-test = { version = "3", features = ["openssl"] }
+actix-http-test = { version = "3.0.0-beta.12", features = ["openssl"] }
 actix-server = "2"
-actix-tls = { version = "3.4", features = ["openssl", "rustls-0_23-webpki-roots"] }
+actix-tls = { version = "3.0.0", features = ["openssl"] }
-actix-web = "4"
+actix-web = "4.0.0-rc.1"
 
 async-stream = "0.3"
-criterion = { version = "0.5", features = ["html_reports"] }
+criterion = { version = "0.3", features = ["html_reports"] }
-divan = "0.1.8"
+env_logger = "0.9"
-env_logger = "0.11"
+futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
-futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
 memchr = "2.4"
-once_cell = "1.21"
+once_cell = "1.9"
-rcgen = "0.13"
+rcgen = "0.8"
 regex = "1.3"
-rustversion = "1"
+rustls-pemfile = "0.2"
-rustls-pemfile = "2"
+serde = { version = "1.0", features = ["derive"] }
-serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"
 static_assertions = "1"
-tls-openssl = { package = "openssl", version = "0.10.55" }
+tls-openssl = { package = "openssl", version = "0.10.9" }
-tls-rustls_023 = { package = "rustls", version = "0.23" }
+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"] }
-
-[lints]
-workspace = true
 
 [[example]]
 name = "ws"
-required-features = ["ws", "rustls-0_23"]
+required-features = ["rustls"]
-
-[[example]]
-name = "tls_rustls"
-required-features = ["http2", "rustls-0_23"]
 
 [[bench]]
-name = "response-body-compression"
+name = "write-camel-case"
 harness = false
-required-features = ["compress-brotli", "compress-gzip", "compress-zstd"]
 
 [[bench]]
-name = "date-formatting"
+name = "status-line"
+harness = false
+
+[[bench]]
+name = "uninit-headers"
+harness = false
+
+[[bench]]
+name = "quality-value"
 harness = false

actix-http/README.md

@@ -1,21 +1,22 @@
-# `actix-http`
+# actix-http
 
-> HTTP types and services for the Actix ecosystem.
+> HTTP primitives for the Actix ecosystem.
-
-<!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http)
-[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.10.0)](https://docs.rs/actix-http/3.10.0)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.0.0-rc.1)](https://docs.rs/actix-http/3.0.0-rc.1)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![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.10.0/status.svg)](https://deps.rs/crate/actix-http/3.10.0)
+[![dependency status](https://deps.rs/crate/actix-http/3.0.0-rc.1/status.svg)](https://deps.rs/crate/actix-http/3.0.0-rc.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)
 
-<!-- prettier-ignore-end -->
+## Documentation & Resources
 
-## Examples
+- [API Documentation](https://docs.rs/actix-http)
+- Minimum Supported Rust Version (MSRV): 1.54
+
+## Example
 
 ```rust
 use std::{env, io};
@@ -24,7 +25,7 @@ use actix_http::{HttpService, Response};
 use actix_server::Server;
 use futures_util::future;
 use http::header::HeaderValue;
-use tracing::info;
+use log::info;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -48,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/date-formatting.rs

@@ -1,20 +0,0 @@
-use std::time::SystemTime;
-
-use actix_http::header::HttpDate;
-use divan::{black_box, AllocProfiler, Bencher};
-
-#[global_allocator]
-static ALLOC: AllocProfiler = AllocProfiler::system();
-
-#[divan::bench]
-fn date_formatting(b: Bencher<'_, '_>) {
-    let now = SystemTime::now();
-
-    b.bench(|| {
-        black_box(HttpDate::from(black_box(now)).to_string());
-    })
-}
-
-fn main() {
-    divan::main();
-}

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,88 +0,0 @@
-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,134 @@
+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(clippy::uninit_assumed_init)]
+
+        let mut headers: [HeaderIndex; MAX_HEADERS] =
+            unsafe { MaybeUninit::uninit().assume_init() };
+
+        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/actix-web.rs

@@ -1,10 +1,10 @@
 use actix_http::HttpService;
 use actix_server::Server;
 use actix_service::map_config;
-use actix_web::{dev::AppConfig, get, App, Responder};
+use actix_web::{dev::AppConfig, get, App};
 
 #[get("/")]
-async fn index() -> impl Responder {
+async fn index() -> &'static str {
     "Hello, world. From Actix Web!"
 }
 
@@ -18,8 +18,7 @@ async fn main() -> std::io::Result<()> {
             HttpService::build()
                 // pass the app to service builder
                 // map_config is used to map App's configuration to ServiceBuilder
-                // h1 will configure server to only use HTTP/1.1
+                .finish(map_config(app, |_| AppConfig::default()))
-                .h1(map_config(app, |_| AppConfig::default()))
                 .tcp()
         })?
         .run()

actix-http/examples/echo.rs

@@ -5,7 +5,6 @@ use actix_server::Server;
 use bytes::BytesMut;
 use futures_util::StreamExt as _;
 use http::header::HeaderValue;
-use tracing::info;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -23,7 +22,7 @@ async fn main() -> io::Result<()> {
                         body.extend_from_slice(&item?);
                     }
 
-                    info!("request body: {body:?}");
+                    log::info!("request body: {:?}", body);
 
                     let res = Response::build(StatusCode::OK)
                         .insert_header(("x-head", HeaderValue::from_static("dummy value!")))
@@ -31,7 +30,8 @@ async fn main() -> io::Result<()> {
 
                     Ok::<_, Error>(res)
                 })
-                .tcp() // No TLS
+                // No TLS
+                .tcp()
         })?
         .run()
         .await

actix-http/examples/h2c-detect.rs

@@ -1,34 +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::{body::BodyStream, 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(BodyStream::new(
-                        futures_util::stream::iter([
-                            Ok::<_, String>("123".into()),
-                            Err("wertyuikmnbvcxdfty6t".to_owned()),
-                        ]),
-                    )))
-                })
-                .tcp_auto_h2c()
-        })?
-        .workers(2)
-        .run()
-        .await
-}

actix-http/examples/hello-world.rs

@@ -1,8 +1,9 @@
 use std::{convert::Infallible, io, time::Duration};
 
-use actix_http::{header::HeaderValue, HttpService, Request, Response, StatusCode};
+use actix_http::{
+    header::HeaderValue, HttpMessage, HttpService, Request, Response, StatusCode,
+};
 use actix_server::Server;
-use tracing::info;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -17,13 +18,16 @@ async fn main() -> io::Result<()> {
                     ext.insert(42u32);
                 })
                 .finish(|req: Request| async move {
-                    info!("{req:?}");
+                    log::info!("{:?}", req);
 
                     let mut res = Response::build(StatusCode::OK);
                     res.insert_header(("x-head", HeaderValue::from_static("dummy value!")));
 
-                    let forty_two = req.conn_data::<u32>().unwrap().to_string();
+                    let forty_two = req.extensions().get::<u32>().unwrap().to_string();
-                    res.insert_header(("x-forty-two", HeaderValue::from_str(&forty_two).unwrap()));
+                    res.insert_header((
+                        "x-forty-two",
+                        HeaderValue::from_str(&forty_two).unwrap(),
+                    ));
 
                     Ok::<_, Infallible>(res.body("Hello world!"))
                 })

actix-http/examples/streaming-error.rs

@@ -12,7 +12,6 @@ use actix_http::{body::BodyStream, HttpService, Response};
 use actix_server::Server;
 use async_stream::stream;
 use bytes::Bytes;
-use tracing::info;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -22,16 +21,16 @@ async fn main() -> io::Result<()> {
         .bind("streaming-error", ("127.0.0.1", 8080), || {
             HttpService::build()
                 .finish(|req| async move {
-                    info!("{req:?}");
+                    log::info!("{:?}", req);
                     let res = Response::ok();
 
                     Ok::<_, Infallible>(res.set_body(BodyStream::new(stream! {
                         yield Ok(Bytes::from("123"));
                         yield Ok(Bytes::from("456"));
 
-                        actix_rt::time::sleep(Duration::from_secs(1)).await;
+                        actix_rt::time::sleep(Duration::from_millis(1000)).await;
 
-                        yield Err(io::Error::new(io::ErrorKind::Other, "abc"));
+                        yield Err(io::Error::new(io::ErrorKind::Other, ""));
                     })))
                 })
                 .tcp()

actix-http/examples/tls_rustls.rs

@@ -1,76 +0,0 @@
-//! Demonstrates TLS configuration (via Rustls) for HTTP/1.1 and HTTP/2 connections.
-//!
-//! Test using cURL:
-//!
-//! ```console
-//! $ curl --insecure https://127.0.0.1:8443
-//! Hello World!
-//! Protocol: HTTP/2.0
-//!
-//! $ curl --insecure --http1.1 https://127.0.0.1:8443
-//! Hello World!
-//! Protocol: HTTP/1.1
-//! ```
-
-extern crate tls_rustls_023 as rustls;
-
-use std::io;
-
-use actix_http::{Error, HttpService, Request, Response};
-use actix_utils::future::ok;
-
-#[actix_rt::main]
-async fn main() -> io::Result<()> {
-    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
-
-    tracing::info!("starting HTTP server at https://127.0.0.1:8443");
-
-    actix_server::Server::build()
-        .bind("echo", ("127.0.0.1", 8443), || {
-            HttpService::build()
-                .finish(|req: Request| {
-                    let body = format!(
-                        "Hello World!\n\
-                        Protocol: {:?}",
-                        req.head().version
-                    );
-                    ok::<_, Error>(Response::ok().set_body(body))
-                })
-                .rustls_0_23(rustls_config())
-        })?
-        .run()
-        .await
-}
-
-fn rustls_config() -> rustls::ServerConfig {
-    let rcgen::CertifiedKey { cert, key_pair } =
-        rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
-    let cert_file = cert.pem();
-    let key_file = key_pair.serialize_pem();
-
-    let cert_file = &mut io::BufReader::new(cert_file.as_bytes());
-    let key_file = &mut io::BufReader::new(key_file.as_bytes());
-
-    let cert_chain = rustls_pemfile::certs(cert_file)
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
-    let mut keys = rustls_pemfile::pkcs8_private_keys(key_file)
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
-
-    let mut config = rustls::ServerConfig::builder()
-        .with_no_client_auth()
-        .with_single_cert(
-            cert_chain,
-            rustls::pki_types::PrivateKeyDer::Pkcs8(keys.remove(0)),
-        )
-        .unwrap();
-
-    const H1_ALPN: &[u8] = b"http/1.1";
-    const H2_ALPN: &[u8] = b"h2";
-
-    config.alpn_protocols.push(H2_ALPN.to_vec());
-    config.alpn_protocols.push(H1_ALPN.to_vec());
-
-    config
-}

actix-http/examples/ws.rs

@@ -1,7 +1,7 @@
 //! Sets up a WebSocket server over TCP and TLS.
 //! Sends a heartbeat message every 4 seconds but does not respond to any incoming frames.
 
-extern crate tls_rustls_023 as rustls;
+extern crate tls_rustls as rustls;
 
 use std::{
     io,
@@ -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;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -27,22 +27,20 @@ async fn main() -> io::Result<()> {
             HttpService::build().h1(handler).tcp()
         })?
         .bind("tls", ("127.0.0.1", 8443), || {
-            HttpService::build()
+            HttpService::build().finish(handler).rustls(tls_config())
-                .finish(handler)
-                .rustls_0_23(tls_config())
         })?
         .run()
         .await
 }
 
 async fn handler(req: Request) -> Result<Response<BodyStream<Heartbeat>>, Error> {
-    tracing::info!("handshaking");
+    log::info!("handshaking");
     let mut res = ws::handshake(req.head())?;
 
     // handshake will always fail under HTTP/2
 
-    tracing::info!("responding");
+    log::info!("responding");
-    res.message_body(BodyStream::new(Heartbeat::new(ws::Codec::new())))
+    Ok(res.message_body(BodyStream::new(Heartbeat::new(ws::Codec::new())))?)
 }
 
 struct Heartbeat {
@@ -63,7 +61,7 @@ impl Stream for Heartbeat {
     type Item = Result<Bytes, Error>;
 
     fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        tracing::trace!("poll");
+        log::trace!("poll");
 
         ready!(self.as_mut().interval.poll_tick(cx));
 
@@ -84,27 +82,27 @@ impl Stream for Heartbeat {
 fn tls_config() -> rustls::ServerConfig {
     use std::io::BufReader;
 
+    use rustls::{Certificate, PrivateKey};
     use rustls_pemfile::{certs, pkcs8_private_keys};
 
-    let rcgen::CertifiedKey { cert, key_pair } =
+    let cert = rcgen::generate_simple_self_signed(vec!["localhost".to_owned()]).unwrap();
-        rcgen::generate_simple_self_signed(["localhost".to_owned()]).unwrap();
+    let cert_file = cert.serialize_pem().unwrap();
-    let cert_file = cert.pem();
+    let key_file = cert.serialize_private_key_pem();
-    let key_file = key_pair.serialize_pem();
 
     let cert_file = &mut BufReader::new(cert_file.as_bytes());
     let key_file = &mut BufReader::new(key_file.as_bytes());
 
-    let cert_chain = certs(cert_file).collect::<Result<Vec<_>, _>>().unwrap();
+    let cert_chain = certs(cert_file)
-    let mut keys = pkcs8_private_keys(key_file)
+        .unwrap()
-        .collect::<Result<Vec<_>, _>>()
+        .into_iter()
-        .unwrap();
+        .map(Certificate)
+        .collect();
+    let mut keys = pkcs8_private_keys(key_file).unwrap();
 
     let mut config = rustls::ServerConfig::builder()
+        .with_safe_defaults()
         .with_no_client_auth()
-        .with_single_cert(
+        .with_single_cert(cert_chain, PrivateKey(keys.remove(0)))
-            cert_chain,
-            rustls::pki_types::PrivateKeyDer::Pkcs8(keys.remove(0)),
-        )
         .unwrap();
 
     config.alpn_protocols.push(b"http/1.1".to_vec());

actix-http/src/body/body_stream.rs

@@ -47,8 +47,9 @@ where
 
     /// Attempts to pull out the next value of the underlying [`Stream`].
     ///
-    /// Empty values are skipped to prevent [`BodyStream`]'s transmission being ended on a
+    /// Empty values are skipped to prevent [`BodyStream`]'s transmission being
-    /// zero-length chunk, but rather proceed until the underlying [`Stream`] ends.
+    /// ended on a zero-length chunk, but rather proceed until the underlying
+    /// [`Stream`] ends.
     fn poll_next(
         mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
@@ -79,7 +80,7 @@ mod tests {
     use futures_core::ready;
     use futures_util::{stream, FutureExt as _};
     use pin_project_lite::pin_project;
-    use static_assertions::{assert_impl_all, assert_not_impl_any};
+    use static_assertions::{assert_impl_all, assert_not_impl_all};
 
     use super::*;
     use crate::body::to_bytes;
@@ -90,10 +91,10 @@ mod tests {
     assert_impl_all!(BodyStream<stream::Empty<Result<Bytes, Infallible>>>: MessageBody);
     assert_impl_all!(BodyStream<stream::Repeat<Result<Bytes, Infallible>>>: MessageBody);
 
-    assert_not_impl_any!(BodyStream<stream::Empty<Bytes>>: MessageBody);
+    assert_not_impl_all!(BodyStream<stream::Empty<Bytes>>: MessageBody);
-    assert_not_impl_any!(BodyStream<stream::Repeat<Bytes>>: MessageBody);
+    assert_not_impl_all!(BodyStream<stream::Repeat<Bytes>>: MessageBody);
     // crate::Error is not Clone
-    assert_not_impl_any!(BodyStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
+    assert_not_impl_all!(BodyStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
 
     #[actix_rt::test]
     async fn skips_empty_chunks() {
@@ -131,7 +132,7 @@ mod tests {
         assert_eq!(to_bytes(body).await.ok(), Some(Bytes::from("12")));
     }
     #[derive(Debug, Display, Error)]
-    #[display("stream error")]
+    #[display(fmt = "stream error")]
     struct StreamErr;
 
     #[actix_rt::test]

actix-http/src/body/boxed.rs

@@ -77,8 +77,12 @@ impl MessageBody for BoxBody {
         cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         match &mut self.0 {
-            BoxBodyInner::None(body) => Pin::new(body).poll_next(cx).map_err(|err| match err {}),
+            BoxBodyInner::None(body) => {
-            BoxBodyInner::Bytes(body) => Pin::new(body).poll_next(cx).map_err(|err| match err {}),
+                Pin::new(body).poll_next(cx).map_err(|err| match err {})
+            }
+            BoxBodyInner::Bytes(body) => {
+                Pin::new(body).poll_next(cx).map_err(|err| match err {})
+            }
             BoxBodyInner::Stream(body) => Pin::new(body).poll_next(cx),
         }
     }
@@ -100,13 +104,15 @@ impl MessageBody for BoxBody {
 
 #[cfg(test)]
 mod tests {
-    use static_assertions::{assert_impl_all, assert_not_impl_any};
+
+    use static_assertions::{assert_impl_all, assert_not_impl_all};
 
     use super::*;
     use crate::body::to_bytes;
 
-    assert_impl_all!(BoxBody: fmt::Debug, MessageBody, Unpin);
+    assert_impl_all!(BoxBody: MessageBody, fmt::Debug, Unpin);
-    assert_not_impl_any!(BoxBody: Send, Sync);
+
+    assert_not_impl_all!(BoxBody: Send, Sync, Unpin);
 
     #[actix_rt::test]
     async fn nested_boxed_body() {

actix-http/src/body/either.rs

@@ -10,17 +10,6 @@ use super::{BodySize, BoxBody, MessageBody};
 use crate::Error;
 
 pin_project! {
-    /// An "either" type specialized for body types.
-    ///
-    /// It is common, in middleware especially, to conditionally return an inner service's unknown/
-    /// generic body `B` type or return early with a new response. This type's "right" variant
-    /// defaults to `BoxBody` since error responses are the common case.
-    ///
-    /// For example, middleware will often have `type Response = ServiceResponse<EitherBody<B>>`.
-    /// This means that the inner service's response body type maps to the `Left` variant and the
-    /// middleware's own error responses use the default `Right` variant of `BoxBody`. Of course,
-    /// there's no reason it couldn't use `EitherBody<B, String>` instead if its alternative
-    /// responses have a known type.
     #[project = EitherBodyProj]
     #[derive(Debug, Clone)]
     pub enum EitherBody<L, R = BoxBody> {
@@ -33,10 +22,7 @@ pin_project! {
 }
 
 impl<L> EitherBody<L, BoxBody> {
-    /// Creates new `EitherBody` left variant with a boxed right variant.
+    /// Creates new `EitherBody` using left variant and boxed right variant.
-    ///
-    /// If the expected `R` type will be inferred and is not `BoxBody` then use the
-    /// [`left`](Self::left) constructor instead.
     #[inline]
     pub fn new(body: L) -> Self {
         Self::Left { body }

actix-http/src/body/message_body.rs

@@ -19,7 +19,7 @@ use super::{BodySize, BoxBody};
 /// It is not usually necessary to create custom body types, this trait is already [implemented for
 /// a large number of sensible body types](#foreign-impls) including:
 /// - Empty body: `()`
-/// - Text-based: `String`, `&'static str`, [`ByteString`](https://docs.rs/bytestring/1).
+/// - Text-based: `String`, `&'static str`, `ByteString`.
 /// - Byte-based: `Bytes`, `BytesMut`, `Vec<u8>`, `&'static [u8]`;
 /// - Streams: [`BodyStream`](super::BodyStream), [`SizedStream`](super::SizedStream)
 ///
@@ -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;
 
@@ -531,7 +444,7 @@ where
 mod tests {
     use actix_rt::pin;
     use actix_utils::future::poll_fn;
-    use futures_util::stream;
+    use bytes::{Bytes, BytesMut};
 
     use super::*;
     use crate::body::{self, EitherBody};
@@ -554,7 +467,6 @@ mod tests {
         };
     }
 
-    #[allow(unused_allocation)] // triggered by `Box::new(()).size()`
     #[actix_rt::test]
     async fn boxing_equivalence() {
         assert_eq!(().size(), BodySize::Sized(0));
@@ -569,35 +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() {
         let pl = ();
@@ -723,18 +606,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

@@ -14,14 +14,12 @@ mod size;
 mod sized_stream;
 mod utils;
 
+pub use self::body_stream::BodyStream;
+pub use self::boxed::BoxBody;
+pub use self::either::EitherBody;
+pub use self::message_body::MessageBody;
 pub(crate) use self::message_body::MessageBodyMapErr;
-pub use self::{
+pub use self::none::None;
-    body_stream::BodyStream,
+pub use self::size::BodySize;
-    boxed::BoxBody,
+pub use self::sized_stream::SizedStream;
-    either::EitherBody,
+pub use self::utils::to_bytes;
-    message_body::MessageBody,
-    none::None,
-    size::BodySize,
-    sized_stream::SizedStream,
-    utils::{to_bytes, to_bytes_limited, BodyLimitExceeded},
-};

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`].
@@ -76,7 +76,7 @@ mod tests {
     use actix_rt::pin;
     use actix_utils::future::poll_fn;
     use futures_util::stream;
-    use static_assertions::{assert_impl_all, assert_not_impl_any};
+    use static_assertions::{assert_impl_all, assert_not_impl_all};
 
     use super::*;
     use crate::body::to_bytes;
@@ -87,10 +87,10 @@ mod tests {
     assert_impl_all!(SizedStream<stream::Empty<Result<Bytes, Infallible>>>: MessageBody);
     assert_impl_all!(SizedStream<stream::Repeat<Result<Bytes, Infallible>>>: MessageBody);
 
-    assert_not_impl_any!(SizedStream<stream::Empty<Bytes>>: MessageBody);
+    assert_not_impl_all!(SizedStream<stream::Empty<Bytes>>: MessageBody);
-    assert_not_impl_any!(SizedStream<stream::Repeat<Bytes>>: MessageBody);
+    assert_not_impl_all!(SizedStream<stream::Repeat<Bytes>>: MessageBody);
     // crate::Error is not Clone
-    assert_not_impl_any!(SizedStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
+    assert_not_impl_all!(SizedStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
 
     #[actix_rt::test]
     async fn skips_empty_chunks() {

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("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::None | BodySize::Sized(0) => return Ok(Bytes::new()),
-        BodySize::Sized(size) if size as usize > limit => return Err(BodyLimitExceeded),
+        BodySize::Sized(size) => size as usize,
-        BodySize::Sized(size) => (size as usize).min(INITIAL_ALLOC_BYTES),
+        // good enough first guess for chunk size
-        BodySize::Stream => INITIAL_ALLOC_BYTES,
+        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)) => {
+            Some(Ok(bytes)) => buf.extend_from_slice(&*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)
-            }
             None => return Poll::Ready(Ok(())),
             Some(Err(err)) => return Poll::Ready(Err(err)),
         }
     })
-    .await
+    .await?;
-    {
-        // propagate error returned from body poll
-        Err(err) => Ok(Err(err)),
 
-        // limit was exceeded while reading body
+    Ok(buf.freeze())
-        Ok(()) if exceeded_limit => Err(BodyLimitExceeded),
-
-        // otherwise return body buffer
-        Ok(()) => Ok(Ok(buf.freeze())),
-    }
 }
 
 #[cfg(test)]
-mod tests {
+mod test {
-    use std::io;
-
     use futures_util::{stream, StreamExt as _};
 
     use super::*;
-    use crate::{
+    use crate::{body::BodyStream, Error};
-        body::{BodyStream, SizedStream},
-        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,
@@ -104,13 +104,8 @@ impl ServiceConfig {
         self.0.date_service.now()
     }
 
-    /// Writes date header to `dst` buffer.
+    pub(crate) fn write_date_header(&self, dst: &mut BytesMut, camel_case: bool) {
-    ///
+        let mut buf: [u8; 39] = [0; 39];
-    /// Low-level method that utilizes the built-in efficient date service, requiring fewer syscalls
-    /// than normal. Note that a CRLF (`\r\n`) is included in what is written.
-    #[doc(hidden)]
-    pub fn write_date_header(&self, dst: &mut BytesMut, camel_case: bool) {
-        let mut buf: [u8; 37] = [0; 37];
 
         buf[..6].copy_from_slice(if camel_case { b"Date: " } else { b"date: " });
 
@@ -118,7 +113,7 @@ impl ServiceConfig {
             .date_service
             .with_date(|date| buf[6..35].copy_from_slice(&date.bytes));
 
-        buf[35..].copy_from_slice(b"\r\n");
+        buf[35..].copy_from_slice(b"\r\n\r\n");
         dst.extend_from_slice(&buf);
     }
 
@@ -132,15 +127,15 @@ impl ServiceConfig {
 
 #[cfg(test)]
 mod tests {
+    use super::*;
+    use crate::{date::DATE_VALUE_LENGTH, notify_on_drop};
+
     use actix_rt::{
         task::yield_now,
         time::{sleep, sleep_until},
     };
     use memchr::memmem;
 
-    use super::*;
-    use crate::{date::DATE_VALUE_LENGTH, notify_on_drop};
-
     #[actix_rt::test]
     async fn test_date_service_update() {
         let settings =

actix-http/src/date.rs

@@ -28,7 +28,7 @@ impl Date {
 
     fn update(&mut self) {
         self.pos = 0;
-        write!(self, "{}", httpdate::HttpDate::from(SystemTime::now())).unwrap();
+        write!(self, "{}", httpdate::fmt_http_date(SystemTime::now())).unwrap();
     }
 }
 

actix-http/src/encoding/decoder.rs

@@ -9,15 +9,17 @@ use std::{
 
 use actix_rt::task::{spawn_blocking, JoinHandle};
 use bytes::Bytes;
+use futures_core::{ready, Stream};
+
 #[cfg(feature = "compress-gzip")]
 use flate2::write::{GzDecoder, ZlibDecoder};
-use futures_core::{ready, Stream};
+
 #[cfg(feature = "compress-zstd")]
 use zstd::stream::write::Decoder as ZstdDecoder;
 
 use crate::{
     encoding::Writer,
-    error::PayloadError,
+    error::{BlockingError, PayloadError},
     header::{ContentEncoding, HeaderMap, CONTENT_ENCODING},
 };
 
@@ -45,17 +47,14 @@ where
             ContentEncoding::Brotli => Some(ContentDecoder::Brotli(Box::new(
                 brotli::DecompressorWriter::new(Writer::new(), 8_096),
             ))),
-
             #[cfg(feature = "compress-gzip")]
-            ContentEncoding::Deflate => Some(ContentDecoder::Deflate(Box::new(ZlibDecoder::new(
+            ContentEncoding::Deflate => Some(ContentDecoder::Deflate(Box::new(
-                Writer::new(),
+                ZlibDecoder::new(Writer::new()),
-            )))),
+            ))),
-
             #[cfg(feature = "compress-gzip")]
             ContentEncoding::Gzip => Some(ContentDecoder::Gzip(Box::new(GzDecoder::new(
                 Writer::new(),
             )))),
-
             #[cfg(feature = "compress-zstd")]
             ContentEncoding::Zstd => Some(ContentDecoder::Zstd(Box::new(
                 ZstdDecoder::new(Writer::new()).expect(
@@ -99,12 +98,8 @@ where
 
         loop {
             if let Some(ref mut fut) = this.fut {
-                let (chunk, decoder) = ready!(Pin::new(fut).poll(cx)).map_err(|_| {
+                let (chunk, decoder) =
-                    PayloadError::Io(io::Error::new(
+                    ready!(Pin::new(fut).poll(cx)).map_err(|_| BlockingError)??;
-                        io::ErrorKind::Other,
-                        "Blocking task was cancelled unexpectedly",
-                    ))
-                })??;
 
                 *this.decoder = Some(decoder);
                 this.fut.take();
@@ -164,13 +159,10 @@ where
 enum ContentDecoder {
     #[cfg(feature = "compress-gzip")]
     Deflate(Box<ZlibDecoder<Writer>>),
-
     #[cfg(feature = "compress-gzip")]
     Gzip(Box<GzDecoder<Writer>>),
-
     #[cfg(feature = "compress-brotli")]
     Brotli(Box<brotli::DecompressorWriter<Writer>>),
-
     // We need explicit 'static lifetime here because ZstdDecoder need lifetime
     // argument, and we use `spawn_blocking` in `Decoder::poll_next` that require `FnOnce() -> R + Send + 'static`
     #[cfg(feature = "compress-zstd")]
@@ -191,7 +183,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -205,7 +197,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -218,7 +210,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-zstd")]
@@ -231,7 +223,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
         }
     }
@@ -250,7 +242,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -265,7 +257,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -280,7 +272,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-zstd")]
@@ -295,7 +287,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
         }
     }

actix-http/src/encoding/encoder.rs

@@ -11,17 +11,19 @@ use std::{
 use actix_rt::task::{spawn_blocking, JoinHandle};
 use bytes::Bytes;
 use derive_more::Display;
-#[cfg(feature = "compress-gzip")]
-use flate2::write::{GzEncoder, ZlibEncoder};
 use futures_core::ready;
 use pin_project_lite::pin_project;
-use tracing::trace;
+
+#[cfg(feature = "compress-gzip")]
+use flate2::write::{GzEncoder, ZlibEncoder};
+
 #[cfg(feature = "compress-zstd")]
 use zstd::stream::write::Encoder as ZstdEncoder;
 
 use super::Writer;
 use crate::{
     body::{self, BodySize, MessageBody},
+    error::BlockingError,
     header::{self, ContentEncoding, HeaderValue, CONTENT_ENCODING},
     ResponseHead, StatusCode,
 };
@@ -50,21 +52,10 @@ impl<B: MessageBody> Encoder<B> {
         }
     }
 
-    fn empty() -> Self {
-        Encoder {
-            body: EncoderBody::Full { body: Bytes::new() },
-            encoder: None,
-            fut: None,
-            eof: true,
-        }
-    }
-
     pub fn response(encoding: ContentEncoding, head: &mut ResponseHead, body: B) -> Self {
-        // no need to compress empty bodies
+        // no need to compress an empty body
-        match body.size() {
+        if matches!(body.size(), BodySize::None) {
-            BodySize::None => return Self::none(),
+            return Self::none();
-            BodySize::Sized(0) => return Self::empty(),
-            _ => {}
         }
 
         let should_encode = !(head.headers().contains_key(&CONTENT_ENCODING)
@@ -182,12 +173,7 @@ where
 
             if let Some(ref mut fut) = this.fut {
                 let mut encoder = ready!(Pin::new(fut).poll(cx))
-                    .map_err(|_| {
+                    .map_err(|_| EncoderError::Blocking(BlockingError))?
-                        EncoderError::Io(io::Error::new(
-                            io::ErrorKind::Other,
-                            "Blocking task was cancelled unexpectedly",
-                        ))
-                    })?
                     .map_err(EncoderError::Io)?;
 
                 let chunk = encoder.take();
@@ -266,7 +252,7 @@ fn update_head(encoding: ContentEncoding, head: &mut ResponseHead) {
     head.headers_mut()
         .insert(header::CONTENT_ENCODING, encoding.to_header_value());
     head.headers_mut()
-        .append(header::VARY, HeaderValue::from_static("accept-encoding"));
+        .insert(header::VARY, HeaderValue::from_static("accept-encoding"));
 
     head.no_chunking(false);
 }
@@ -366,7 +352,7 @@ impl ContentEncoder {
             ContentEncoder::Brotli(ref mut encoder) => match encoder.write_all(data) {
                 Ok(_) => Ok(()),
                 Err(err) => {
-                    trace!("Error decoding br encoding: {}", err);
+                    log::trace!("Error decoding br encoding: {}", err);
                     Err(err)
                 }
             },
@@ -375,7 +361,7 @@ impl ContentEncoder {
             ContentEncoder::Gzip(ref mut encoder) => match encoder.write_all(data) {
                 Ok(_) => Ok(()),
                 Err(err) => {
-                    trace!("Error decoding gzip encoding: {}", err);
+                    log::trace!("Error decoding gzip encoding: {}", err);
                     Err(err)
                 }
             },
@@ -384,7 +370,7 @@ impl ContentEncoder {
             ContentEncoder::Deflate(ref mut encoder) => match encoder.write_all(data) {
                 Ok(_) => Ok(()),
                 Err(err) => {
-                    trace!("Error decoding deflate encoding: {}", err);
+                    log::trace!("Error decoding deflate encoding: {}", err);
                     Err(err)
                 }
             },
@@ -393,7 +379,7 @@ impl ContentEncoder {
             ContentEncoder::Zstd(ref mut encoder) => match encoder.write_all(data) {
                 Ok(_) => Ok(()),
                 Err(err) => {
-                    trace!("Error decoding ztsd encoding: {}", err);
+                    log::trace!("Error decoding ztsd encoding: {}", err);
                     Err(err)
                 }
             },
@@ -414,12 +400,13 @@ fn new_brotli_compressor() -> Box<brotli::CompressorWriter<Writer>> {
 #[derive(Debug, Display)]
 #[non_exhaustive]
 pub enum EncoderError {
-    /// Wrapped body stream error.
+    #[display(fmt = "body")]
-    #[display("body")]
     Body(Box<dyn StdError>),
 
-    /// Generic I/O error.
+    #[display(fmt = "blocking")]
-    #[display("io")]
+    Blocking(BlockingError),
+
+    #[display(fmt = "io")]
     Io(io::Error),
 }
 
@@ -427,6 +414,7 @@ impl StdError for EncoderError {
     fn source(&self) -> Option<&(dyn StdError + 'static)> {
         match self {
             EncoderError::Body(err) => Some(&**err),
+            EncoderError::Blocking(err) => Some(err),
             EncoderError::Io(err) => Some(err),
         }
     }

actix-http/src/encoding/mod.rs

@@ -7,12 +7,13 @@ use bytes::{Bytes, BytesMut};
 mod decoder;
 mod encoder;
 
-pub use self::{decoder::Decoder, encoder::Encoder};
+pub use self::decoder::Decoder;
+pub use self::encoder::Encoder;
 
 /// Special-purpose writer for streaming (de-)compression.
 ///
 /// Pre-allocates 8KiB of capacity.
-struct Writer {
+pub(self) struct Writer {
     buf: BytesMut,
 }
 

actix-http/src/error.rs

@@ -3,11 +3,12 @@
 use std::{error::Error as StdError, fmt, io, str::Utf8Error, string::FromUtf8Error};
 
 use derive_more::{Display, Error, From};
-pub use http::{status::InvalidStatusCode, Error as HttpError};
 use http::{uri::InvalidUri, StatusCode};
 
 use crate::{body::BoxBody, Response};
 
+pub use http::Error as HttpError;
+
 pub struct Error {
     inner: Box<ErrorInner>,
 }
@@ -50,7 +51,7 @@ impl Error {
         Self::new(Kind::SendResponse)
     }
 
-    #[allow(unused)] // available for future use
+    #[allow(unused)] // reserved for future use (TODO: remove allow when being used)
     pub(crate) fn new_io() -> Self {
         Self::new(Kind::Io)
     }
@@ -80,37 +81,35 @@ impl From<Error> for Response<BoxBody> {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Display)]
 pub(crate) enum Kind {
-    #[display("error processing HTTP")]
+    #[display(fmt = "error processing HTTP")]
     Http,
 
-    #[display("error parsing HTTP message")]
+    #[display(fmt = "error parsing HTTP message")]
     Parse,
 
-    #[display("request payload read error")]
+    #[display(fmt = "request payload read error")]
     Payload,
 
-    #[display("response body write error")]
+    #[display(fmt = "response body write error")]
     Body,
 
-    #[display("send response error")]
+    #[display(fmt = "send response error")]
     SendResponse,
 
-    #[display("error in WebSocket process")]
+    #[display(fmt = "error in WebSocket process")]
     Ws,
 
-    #[display("connection error")]
+    #[display(fmt = "connection error")]
     Io,
 
-    #[display("encoder error")]
+    #[display(fmt = "encoder error")]
     Encoder,
 }
 
 impl fmt::Debug for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("actix_http::Error")
+        // TODO: more detail
-            .field("kind", &self.inner.kind)
+        f.write_str("actix_http::Error")
-            .field("cause", &self.inner.cause)
-            .finish()
     }
 }
 
@@ -160,44 +159,44 @@ impl From<crate::ws::ProtocolError> for Error {
 #[non_exhaustive]
 pub enum ParseError {
     /// An invalid `Method`, such as `GE.T`.
-    #[display("invalid method specified")]
+    #[display(fmt = "Invalid Method specified")]
     Method,
 
     /// An invalid `Uri`, such as `exam ple.domain`.
-    #[display("URI error: {}", _0)]
+    #[display(fmt = "Uri error: {}", _0)]
     Uri(InvalidUri),
 
     /// An invalid `HttpVersion`, such as `HTP/1.1`
-    #[display("invalid HTTP version specified")]
+    #[display(fmt = "Invalid HTTP version specified")]
     Version,
 
     /// An invalid `Header`.
-    #[display("invalid Header provided")]
+    #[display(fmt = "Invalid Header provided")]
     Header,
 
     /// A message head is too large to be reasonable.
-    #[display("message head is too large")]
+    #[display(fmt = "Message head is too large")]
     TooLarge,
 
     /// A message reached EOF, but is not complete.
-    #[display("message is incomplete")]
+    #[display(fmt = "Message is incomplete")]
     Incomplete,
 
     /// An invalid `Status`, such as `1337 ELITE`.
-    #[display("invalid status provided")]
+    #[display(fmt = "Invalid Status provided")]
     Status,
 
     /// A timeout occurred waiting for an IO event.
     #[allow(dead_code)]
-    #[display("timeout")]
+    #[display(fmt = "Timeout")]
     Timeout,
 
-    /// An I/O error that occurred while trying to read or write to a network stream.
+    /// An `io::Error` that occurred while trying to read or write to a network stream.
-    #[display("I/O error: {}", _0)]
+    #[display(fmt = "IO error: {}", _0)]
     Io(io::Error),
 
     /// Parsing a field as string failed.
-    #[display("UTF-8 error: {}", _0)]
+    #[display(fmt = "UTF8 error: {}", _0)]
     Utf8(Utf8Error),
 }
 
@@ -251,33 +250,42 @@ impl From<ParseError> for Response<BoxBody> {
     }
 }
 
+/// A set of errors that can occur running blocking tasks in thread pool.
+#[derive(Debug, Display, Error)]
+#[display(fmt = "Blocking thread pool is gone")]
+// TODO: non-exhaustive
+pub struct BlockingError;
+
 /// A set of errors that can occur during payload parsing.
 #[derive(Debug, Display)]
 #[non_exhaustive]
 pub enum PayloadError {
     /// A payload reached EOF, but is not complete.
-    #[display("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("can not decode content-encoding")]
+    #[display(fmt = "Can not decode content-encoding.")]
     EncodingCorrupted,
 
     /// Payload reached size limit.
-    #[display("payload reached size limit")]
+    #[display(fmt = "Payload reached size limit.")]
     Overflow,
 
     /// Payload length is unknown.
-    #[display("payload length is unknown")]
+    #[display(fmt = "Payload length is unknown.")]
     UnknownLength,
 
     /// HTTP/2 payload error.
     #[cfg(feature = "http2")]
-    #[display("{}", _0)]
+    #[display(fmt = "{}", _0)]
     Http2Payload(::h2::Error),
 
     /// Generic I/O error.
-    #[display("{}", _0)]
+    #[display(fmt = "{}", _0)]
     Io(io::Error),
 }
 
@@ -285,13 +293,13 @@ impl std::error::Error for PayloadError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
             PayloadError::Incomplete(None) => None,
-            PayloadError::Incomplete(Some(err)) => Some(err),
+            PayloadError::Incomplete(Some(err)) => Some(err as &dyn std::error::Error),
             PayloadError::EncodingCorrupted => None,
             PayloadError::Overflow => None,
             PayloadError::UnknownLength => None,
             #[cfg(feature = "http2")]
-            PayloadError::Http2Payload(err) => Some(err),
+            PayloadError::Http2Payload(err) => Some(err as &dyn std::error::Error),
-            PayloadError::Io(err) => Some(err),
+            PayloadError::Io(err) => Some(err as &dyn std::error::Error),
         }
     }
 }
@@ -315,6 +323,15 @@ impl From<io::Error> for PayloadError {
     }
 }
 
+impl From<BlockingError> for PayloadError {
+    fn from(_: BlockingError) -> Self {
+        PayloadError::Io(io::Error::new(
+            io::ErrorKind::Other,
+            "Operation is canceled",
+        ))
+    }
+}
+
 impl From<PayloadError> for Error {
     fn from(err: PayloadError) -> Self {
         Self::new_payload().with_cause(err)
@@ -323,53 +340,48 @@ impl From<PayloadError> for Error {
 
 /// A set of errors that can occur during dispatching HTTP requests.
 #[derive(Debug, Display, From)]
-#[non_exhaustive]
 pub enum DispatchError {
     /// Service error.
-    #[display("service error")]
+    #[display(fmt = "Service Error")]
     Service(Response<BoxBody>),
 
     /// Body streaming error.
-    #[display("body error: {}", _0)]
+    #[display(fmt = "Body error: {}", _0)]
     Body(Box<dyn StdError>),
 
     /// Upgrade service error.
-    #[display("upgrade error")]
     Upgrade,
 
     /// An `io::Error` that occurred while trying to read or write to a network stream.
-    #[display("I/O error: {}", _0)]
+    #[display(fmt = "IO error: {}", _0)]
     Io(io::Error),
 
     /// Request parse error.
-    #[display("request parse error: {}", _0)]
+    #[display(fmt = "Request parse error: {}", _0)]
     Parse(ParseError),
 
     /// HTTP/2 error.
-    #[display("{}", _0)]
+    #[display(fmt = "{}", _0)]
     #[cfg(feature = "http2")]
     H2(h2::Error),
 
     /// The first request did not complete within the specified timeout.
-    #[display("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.
+    /// Disconnect timeout. Makes sense for ssl streams.
-    #[display("connection shutdown timeout")]
+    #[display(fmt = "Connection shutdown timeout")]
     DisconnectTimeout,
 
-    /// Handler dropped payload before reading EOF.
-    #[display("handler dropped payload before reading EOF")]
-    HandlerDroppedPayload,
-
     /// Internal error.
-    #[display("internal error")]
+    #[display(fmt = "Internal error")]
     InternalError,
 }
 
 impl StdError for DispatchError {
     fn source(&self) -> Option<&(dyn StdError + 'static)> {
         match self {
+            // TODO: error source extraction?
             DispatchError::Service(_res) => None,
             DispatchError::Body(err) => Some(&**err),
             DispatchError::Io(err) => Some(err),
@@ -385,21 +397,23 @@ 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.
+    /// Can not parse content type
-    #[display("could not parse content type")]
+    #[display(fmt = "Can not parse content type")]
     ParseError,
 
-    /// Unknown content encoding.
+    /// Unknown content encoding
-    #[display("unknown content encoding")]
+    #[display(fmt = "Unknown content encoding")]
     UnknownEncoding,
 }
 
 #[cfg(test)]
 mod tests {
-    use http::Error as HttpError;
+    use std::io;
+
+    use http::{Error as HttpError, StatusCode};
 
     use super::*;
 
@@ -419,7 +433,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"
         );
     }
 
@@ -446,7 +460,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"
         );
     }
 
@@ -466,7 +480,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,38 +1,17 @@
 use std::{
     any::{Any, TypeId},
-    collections::HashMap,
     fmt,
-    hash::{BuildHasherDefault, Hasher},
 };
 
-/// A hasher for `TypeId`s that takes advantage of its known characteristics.
+use ahash::AHashMap;
-///
-/// 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
-    }
-}
 
 /// A type map for request extensions.
 ///
 /// All entries into this map must be owned types (or static references).
 #[derive(Default)]
 pub struct Extensions {
-    // use no-op hasher with a std HashMap with for faster lookups on the small `TypeId` keys
+    /// 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(),
         }
     }
 
@@ -104,46 +83,6 @@ impl Extensions {
             .and_then(|boxed| boxed.downcast_mut())
     }
 
-    /// Inserts the given `value` into the extensions if it is not present, then returns a reference
-    /// to the value in the extensions.
-    ///
-    /// ```
-    /// # use actix_http::Extensions;
-    /// let mut map = Extensions::new();
-    /// assert_eq!(map.get::<Vec<u32>>(), None);
-    ///
-    /// map.get_or_insert(Vec::<u32>::new()).push(1);
-    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1]));
-    ///
-    /// map.get_or_insert(Vec::<u32>::new()).push(2);
-    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1,2]));
-    /// ```
-    pub fn get_or_insert<T: 'static>(&mut self, value: T) -> &mut T {
-        self.get_or_insert_with(|| value)
-    }
-
-    /// Inserts a value computed from `f` into the extensions if the given `value` is not present,
-    /// then returns a reference to the value in the extensions.
-    ///
-    /// ```
-    /// # use actix_http::Extensions;
-    /// let mut map = Extensions::new();
-    /// assert_eq!(map.get::<Vec<u32>>(), None);
-    ///
-    /// map.get_or_insert_with(Vec::<u32>::new).push(1);
-    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1]));
-    ///
-    /// map.get_or_insert_with(Vec::<u32>::new).push(2);
-    /// assert_eq!(map.get::<Vec<u32>>(), Some(&vec![1,2]));
-    /// ```
-    pub fn get_or_insert_with<T: 'static, F: FnOnce() -> T>(&mut self, default: F) -> &mut T {
-        self.map
-            .entry(TypeId::of::<T>())
-            .or_insert_with(|| Box::new(default()))
-            .downcast_mut()
-            .expect("extensions map should now contain a T value")
-    }
-
     /// Remove an item from the map of a given type.
     ///
     /// If an item of this type was already stored, it will be returned.

actix-http/src/h1/chunked.rs

@@ -1,7 +1,6 @@
 use std::{io, task::Poll};
 
 use bytes::{Buf as _, Bytes, BytesMut};
-use tracing::{debug, trace};
 
 macro_rules! byte (
     ($rdr:ident) => ({
@@ -15,7 +14,7 @@ macro_rules! byte (
     })
 );
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Clone)]
 pub(super) enum ChunkedState {
     Size,
     SizeLws,
@@ -71,13 +70,13 @@ impl ChunkedState {
 
         match size.checked_mul(radix) {
             Some(n) => {
-                *size = n;
+                *size = n as u64;
                 *size += rem as u64;
 
                 Poll::Ready(Ok(ChunkedState::Size))
             }
             None => {
-                debug!("chunk size would overflow u64");
+                log::debug!("chunk size would overflow u64");
                 Poll::Ready(Err(io::Error::new(
                     io::ErrorKind::InvalidInput,
                     "Invalid chunk size line: Size is too big",
@@ -125,7 +124,7 @@ impl ChunkedState {
         rem: &mut u64,
         buf: &mut Option<Bytes>,
     ) -> Poll<Result<ChunkedState, io::Error>> {
-        trace!("Chunked read, remaining={:?}", rem);
+        log::trace!("Chunked read, remaining={:?}", rem);
 
         let len = rdr.len() as u64;
         if len == 0 {

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},
@@ -16,7 +16,6 @@ use crate::{
 };
 
 bitflags! {
-    #[derive(Debug, Clone, Copy)]
     struct Flags: u8 {
         const HEAD               = 0b0000_0001;
         const KEEP_ALIVE_ENABLED = 0b0000_1000;
@@ -129,10 +128,7 @@ impl Decoder for ClientCodec {
     type Error = ParseError;
 
     fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
-        debug_assert!(
+        debug_assert!(!self.inner.payload.is_some(), "Payload decoder is set");
-            self.inner.payload.is_none(),
-            "Payload decoder should not be set"
-        );
 
         if let Some((req, payload)) = self.inner.decoder.decode(src)? {
             if let Some(conn_type) = req.conn_type() {

actix-http/src/h1/codec.rs

@@ -1,18 +1,19 @@
 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},
     encoder, Message, MessageType,
 };
-use crate::{body::BodySize, error::ParseError, ConnectionType, Request, Response, ServiceConfig};
+use crate::{
+    body::BodySize, error::ParseError, ConnectionType, Request, Response, ServiceConfig,
+};
 
 bitflags! {
-    #[derive(Debug, Clone, Copy)]
     struct Flags: u8 {
         const HEAD               = 0b0000_0001;
         const KEEP_ALIVE_ENABLED = 0b0000_0010;
@@ -124,13 +125,11 @@ impl Decoder for Codec {
             self.flags.set(Flags::HEAD, head.method == Method::HEAD);
             self.version = head.version;
             self.conn_type = head.connection_type();
-
             if self.conn_type == ConnectionType::KeepAlive
                 && !self.flags.contains(Flags::KEEP_ALIVE_ENABLED)
             {
                 self.conn_type = ConnectionType::Close
             }
-
             match payload {
                 PayloadType::None => self.payload = None,
                 PayloadType::Payload(pl) => self.payload = Some(pl),
@@ -198,6 +197,9 @@ impl Encoder<Message<(Response<()>, BodySize)>> for Codec {
 
 #[cfg(test)]
 mod tests {
+    use bytes::BytesMut;
+    use http::Method;
+
     use super::*;
     use crate::HttpMessage as _;
 

actix-http/src/h1/decoder.rs

@@ -1,4 +1,4 @@
-use std::{io, marker::PhantomData, mem::MaybeUninit, task::Poll};
+use std::{convert::TryFrom, io, marker::PhantomData, mem::MaybeUninit, task::Poll};
 
 use actix_codec::Decoder;
 use bytes::{Bytes, BytesMut};
@@ -6,7 +6,7 @@ use http::{
     header::{self, HeaderName, HeaderValue},
     Method, StatusCode, Uri, Version,
 };
-use tracing::{debug, error, trace};
+use log::{debug, error, trace};
 
 use super::chunked::ChunkedState;
 use crate::{error::ParseError, header::HeaderMap, ConnectionType, Request, ResponseHead};
@@ -46,23 +46,6 @@ pub(crate) enum PayloadLength {
     None,
 }
 
-impl PayloadLength {
-    /// Returns true if variant is `None`.
-    fn is_none(&self) -> bool {
-        matches!(self, Self::None)
-    }
-
-    /// Returns true if variant is represents zero-length (not none) payload.
-    fn is_zero(&self) -> bool {
-        matches!(
-            self,
-            PayloadLength::Payload(PayloadType::Payload(PayloadDecoder {
-                kind: Kind::Length(0)
-            }))
-        )
-    }
-}
-
 pub(crate) trait MessageType: Sized {
     fn set_connection_type(&mut self, conn_type: Option<ConnectionType>);
 
@@ -76,7 +59,6 @@ pub(crate) trait MessageType: Sized {
         &mut self,
         slice: &Bytes,
         raw_headers: &[HeaderIndex],
-        version: Version,
     ) -> Result<PayloadLength, ParseError> {
         let mut ka = None;
         let mut has_upgrade_websocket = false;
@@ -94,7 +76,9 @@ pub(crate) trait MessageType: Sized {
                 // SAFETY: httparse already checks header value is only visible ASCII bytes
                 // from_maybe_shared_unchecked contains debug assertions so they are omitted here
                 let value = unsafe {
-                    HeaderValue::from_maybe_shared_unchecked(slice.slice(idx.value.0..idx.value.1))
+                    HeaderValue::from_maybe_shared_unchecked(
+                        slice.slice(idx.value.0..idx.value.1),
+                    )
                 };
 
                 match name {
@@ -103,23 +87,21 @@ pub(crate) trait MessageType: Sized {
                         return Err(ParseError::Header);
                     }
 
-                    header::CONTENT_LENGTH => match value.to_str().map(str::trim) {
+                    header::CONTENT_LENGTH => match value.to_str() {
-                        Ok(val) if val.starts_with('+') => {
+                        Ok(s) if s.trim().starts_with('+') => {
-                            debug!("illegal Content-Length: {:?}", val);
+                            debug!("illegal Content-Length: {:?}", s);
                             return Err(ParseError::Header);
                         }
-
+                        Ok(s) => {
-                        Ok(val) => {
+                            if let Ok(len) = s.parse::<u64>() {
-                            if let Ok(len) = val.parse::<u64>() {
+                                if len != 0 {
-                                // accept 0 lengths here and remove them in `decode` after all
+                                    content_length = Some(len);
-                                // headers have been processed to prevent request smuggling issues
+                                }
-                                content_length = Some(len);
                             } else {
-                                debug!("illegal Content-Length: {:?}", val);
+                                debug!("illegal Content-Length: {:?}", s);
                                 return Err(ParseError::Header);
                             }
                         }
-
                         Err(_) => {
                             debug!("illegal Content-Length: {:?}", value);
                             return Err(ParseError::Header);
@@ -132,23 +114,22 @@ pub(crate) trait MessageType: Sized {
                         return Err(ParseError::Header);
                     }
 
-                    header::TRANSFER_ENCODING if version == Version::HTTP_11 => {
+                    header::TRANSFER_ENCODING => {
                         seen_te = true;
 
-                        if let Ok(val) = value.to_str().map(str::trim) {
+                        if let Ok(s) = value.to_str().map(str::trim) {
-                            if val.eq_ignore_ascii_case("chunked") {
+                            if s.eq_ignore_ascii_case("chunked") {
                                 chunked = true;
-                            } else if val.eq_ignore_ascii_case("identity") {
+                            } else if s.eq_ignore_ascii_case("identity") {
                                 // allow silently since multiple TE headers are already checked
                             } else {
-                                debug!("illegal Transfer-Encoding: {:?}", val);
+                                debug!("illegal Transfer-Encoding: {:?}", s);
                                 return Err(ParseError::Header);
                             }
                         } else {
                             return Err(ParseError::Header);
                         }
                     }
-
                     // connection keep-alive state
                     header::CONNECTION => {
                         ka = if let Ok(conn) = value.to_str().map(str::trim) {
@@ -165,7 +146,6 @@ pub(crate) trait MessageType: Sized {
                             None
                         };
                     }
-
                     header::UPGRADE => {
                         if let Ok(val) = value.to_str().map(str::trim) {
                             if val.eq_ignore_ascii_case("websocket") {
@@ -173,23 +153,19 @@ pub(crate) trait MessageType: Sized {
                             }
                         }
                     }
-
                     header::EXPECT => {
                         let bytes = value.as_bytes();
                         if bytes.len() >= 4 && &bytes[0..4] == b"100-" {
                             expect = true;
                         }
                     }
-
                     _ => {}
                 }
 
                 headers.append(name, value);
             }
         }
-
         self.set_connection_type(ka);
-
         if expect {
             self.set_expect()
         }
@@ -233,16 +209,15 @@ impl MessageType for Request {
 
         let (len, method, uri, ver, h_len) = {
             // SAFETY:
-            // Create an uninitialized array of `MaybeUninit`. The `assume_init` is safe because the
+            // Create an uninitialized array of `MaybeUninit`. The `assume_init` is
-            // type we are claiming to have initialized here is a bunch of `MaybeUninit`s, which
+            // safe because the type we are claiming to have initialized here is a
-            // do not require initialization.
+            // bunch of `MaybeUninit`s, which do not require initialization.
             let mut parsed = unsafe {
                 MaybeUninit::<[MaybeUninit<httparse::Header<'_>>; MAX_HEADERS]>::uninit()
                     .assume_init()
             };
 
             let mut req = httparse::Request::new(&mut []);
-
             match req.parse_with_uninit_headers(src, &mut parsed)? {
                 httparse::Status::Complete(len) => {
                     let method = Method::from_bytes(req.method.unwrap().as_bytes())
@@ -257,7 +232,6 @@ impl MessageType for Request {
 
                     (len, method, uri, version, req.headers.len())
                 }
-
                 httparse::Status::Partial => {
                     return if src.len() >= MAX_BUFFER_SIZE {
                         trace!("MAX_BUFFER_SIZE unprocessed data reached, closing");
@@ -273,21 +247,7 @@ impl MessageType for Request {
         let mut msg = Request::new();
 
         // convert headers
-        let mut length = msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len], ver)?;
+        let length = msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len])?;
-
-        // disallow HTTP/1.0 POST requests that do not contain a Content-Length headers
-        // see https://datatracker.ietf.org/doc/html/rfc1945#section-7.2.2
-        if ver == Version::HTTP_10 && method == Method::POST && length.is_none() {
-            debug!("no Content-Length specified for HTTP/1.0 POST request");
-            return Err(ParseError::Header);
-        }
-
-        // Remove CL value if 0 now that all headers and HTTP/1.0 special cases are processed.
-        // Protects against some request smuggling attacks.
-        // See https://github.com/actix/actix-web/issues/2767.
-        if length.is_zero() {
-            length = PayloadLength::None;
-        }
 
         // payload decoder
         let decoder = match length {
@@ -331,35 +291,22 @@ impl MessageType for ResponseHead {
         let mut headers: [HeaderIndex; MAX_HEADERS] = EMPTY_HEADER_INDEX_ARRAY;
 
         let (len, ver, status, h_len) = {
-            // SAFETY:
+            let mut parsed: [httparse::Header<'_>; MAX_HEADERS] = EMPTY_HEADER_ARRAY;
-            // Create an uninitialized array of `MaybeUninit`. The `assume_init` is safe because the
-            // type we are claiming to have initialized here is a bunch of `MaybeUninit`s, which
-            // do not require initialization.
-            let mut parsed = unsafe {
-                MaybeUninit::<[MaybeUninit<httparse::Header<'_>>; MAX_HEADERS]>::uninit()
-                    .assume_init()
-            };
 
-            let mut res = httparse::Response::new(&mut []);
+            let mut res = httparse::Response::new(&mut parsed);
-
+            match res.parse(src)? {
-            let mut config = httparse::ParserConfig::default();
-            config.allow_spaces_after_header_name_in_responses(true);
-
-            match config.parse_response_with_uninit_headers(&mut res, src, &mut parsed)? {
                 httparse::Status::Complete(len) => {
                     let version = if res.version.unwrap() == 1 {
                         Version::HTTP_11
                     } else {
                         Version::HTTP_10
                     };
-
+                    let status = StatusCode::from_u16(res.code.unwrap())
-                    let status =
+                        .map_err(|_| ParseError::Status)?;
-                        StatusCode::from_u16(res.code.unwrap()).map_err(|_| ParseError::Status)?;
                     HeaderIndex::record(src, res.headers, &mut headers);
 
                     (len, version, status, res.headers.len())
                 }
-
                 httparse::Status::Partial => {
                     return if src.len() >= MAX_BUFFER_SIZE {
                         error!("MAX_BUFFER_SIZE unprocessed data reached, closing");
@@ -375,14 +322,7 @@ impl MessageType for ResponseHead {
         msg.version = ver;
 
         // convert headers
-        let mut length = msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len], ver)?;
+        let length = msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len])?;
-
-        // Remove CL value if 0 now that all headers and HTTP/1.0 special cases are processed.
-        // Protects against some request smuggling attacks.
-        // See https://github.com/actix/actix-web/issues/2767.
-        if length.is_zero() {
-            length = PayloadLength::None;
-        }
 
         // message payload
         let decoder = if let PayloadLength::Payload(pl) = length {
@@ -418,6 +358,9 @@ pub(crate) const EMPTY_HEADER_INDEX: HeaderIndex = HeaderIndex {
 pub(crate) const EMPTY_HEADER_INDEX_ARRAY: [HeaderIndex; MAX_HEADERS] =
     [EMPTY_HEADER_INDEX; MAX_HEADERS];
 
+pub(crate) const EMPTY_HEADER_ARRAY: [httparse::Header<'static>; MAX_HEADERS] =
+    [httparse::EMPTY_HEADER; MAX_HEADERS];
+
 impl HeaderIndex {
     pub(crate) fn record(
         bytes: &[u8],
@@ -436,7 +379,7 @@ impl HeaderIndex {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 /// Chunk type yielded while decoding a payload.
 pub enum PayloadItem {
     Chunk(Bytes),
@@ -446,7 +389,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,
 }
@@ -472,7 +415,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),
@@ -532,7 +475,7 @@ impl Decoder for PayloadDecoder {
                     *state = match state.step(src, size, &mut buf) {
                         Poll::Pending => return Ok(None),
                         Poll::Ready(Ok(state)) => state,
-                        Poll::Ready(Err(err)) => return Err(err),
+                        Poll::Ready(Err(e)) => return Err(e),
                     };
 
                     if *state == ChunkedState::End {
@@ -563,8 +506,15 @@ impl Decoder for PayloadDecoder {
 
 #[cfg(test)]
 mod tests {
+    use bytes::{Bytes, BytesMut};
+    use http::{Method, Version};
+
     use super::*;
-    use crate::{header::SET_COOKIE, HttpMessage as _};
+    use crate::{
+        error::ParseError,
+        header::{HeaderName, SET_COOKIE},
+        HttpMessage as _,
+    };
 
     impl PayloadType {
         pub(crate) fn unwrap(self) -> PayloadDecoder {
@@ -644,100 +594,14 @@ mod tests {
     }
 
     #[test]
-    fn parse_h09_reject() {
+    fn test_parse_post() {
-        let mut buf = BytesMut::from(
+        let mut buf = BytesMut::from("POST /test2 HTTP/1.0\r\n\r\n");
-            "GET /test1 HTTP/0.9\r\n\
-            \r\n",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        reader.decode(&mut buf).unwrap_err();
-
-        let mut buf = BytesMut::from(
-            "POST /test2 HTTP/0.9\r\n\
-            Content-Length: 3\r\n\
-            \r\n
-            abc",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        reader.decode(&mut buf).unwrap_err();
-    }
-
-    #[test]
-    fn parse_h10_get() {
-        let mut buf = BytesMut::from(
-            "GET /test1 HTTP/1.0\r\n\
-            \r\n",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        let (req, _) = reader.decode(&mut buf).unwrap().unwrap();
-        assert_eq!(req.version(), Version::HTTP_10);
-        assert_eq!(*req.method(), Method::GET);
-        assert_eq!(req.path(), "/test1");
-
-        let mut buf = BytesMut::from(
-            "GET /test2 HTTP/1.0\r\n\
-            Content-Length: 0\r\n\
-            \r\n",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        let (req, _) = reader.decode(&mut buf).unwrap().unwrap();
-        assert_eq!(req.version(), Version::HTTP_10);
-        assert_eq!(*req.method(), Method::GET);
-        assert_eq!(req.path(), "/test2");
-
-        let mut buf = BytesMut::from(
-            "GET /test3 HTTP/1.0\r\n\
-            Content-Length: 3\r\n\
-            \r\n
-            abc",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        let (req, _) = reader.decode(&mut buf).unwrap().unwrap();
-        assert_eq!(req.version(), Version::HTTP_10);
-        assert_eq!(*req.method(), Method::GET);
-        assert_eq!(req.path(), "/test3");
-    }
-
-    #[test]
-    fn parse_h10_post() {
-        let mut buf = BytesMut::from(
-            "POST /test1 HTTP/1.0\r\n\
-            Content-Length: 3\r\n\
-            \r\n\
-            abc",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        let (req, _) = reader.decode(&mut buf).unwrap().unwrap();
-        assert_eq!(req.version(), Version::HTTP_10);
-        assert_eq!(*req.method(), Method::POST);
-        assert_eq!(req.path(), "/test1");
-
-        let mut buf = BytesMut::from(
-            "POST /test2 HTTP/1.0\r\n\
-            Content-Length: 0\r\n\
-            \r\n",
-        );
 
         let mut reader = MessageDecoder::<Request>::default();
         let (req, _) = reader.decode(&mut buf).unwrap().unwrap();
         assert_eq!(req.version(), Version::HTTP_10);
         assert_eq!(*req.method(), Method::POST);
         assert_eq!(req.path(), "/test2");
-
-        let mut buf = BytesMut::from(
-            "POST /test3 HTTP/1.0\r\n\
-            \r\n",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        let err = reader.decode(&mut buf).unwrap_err();
-        assert!(err.to_string().contains("Header"))
     }
 
     #[test]
@@ -833,98 +697,121 @@ mod tests {
 
     #[test]
     fn test_conn_default_1_0() {
-        let req = parse_ready!(&mut BytesMut::from("GET /test HTTP/1.0\r\n\r\n"));
+        let mut buf = BytesMut::from("GET /test HTTP/1.0\r\n\r\n");
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::Close);
     }
 
     #[test]
     fn test_conn_default_1_1() {
-        let req = parse_ready!(&mut BytesMut::from("GET /test HTTP/1.1\r\n\r\n"));
+        let mut buf = BytesMut::from("GET /test HTTP/1.1\r\n\r\n");
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::KeepAlive);
     }
 
     #[test]
     fn test_conn_close() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              connection: close\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::Close);
 
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              connection: Close\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::Close);
     }
 
     #[test]
     fn test_conn_close_1_0() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.0\r\n\
              connection: close\r\n\r\n",
-        ));
+        );
+
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::Close);
     }
 
     #[test]
     fn test_conn_keep_alive_1_0() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.0\r\n\
              connection: keep-alive\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::KeepAlive);
 
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.0\r\n\
              connection: Keep-Alive\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::KeepAlive);
     }
 
     #[test]
     fn test_conn_keep_alive_1_1() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              connection: keep-alive\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::KeepAlive);
     }
 
     #[test]
     fn test_conn_other_1_0() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.0\r\n\
              connection: other\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::Close);
     }
 
     #[test]
     fn test_conn_other_1_1() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              connection: other\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::KeepAlive);
     }
 
     #[test]
     fn test_conn_upgrade() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              upgrade: websockets\r\n\
              connection: upgrade\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
 
         assert!(req.upgrade());
         assert_eq!(req.head().connection_type(), ConnectionType::Upgrade);
 
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              upgrade: Websockets\r\n\
              connection: Upgrade\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
 
         assert!(req.upgrade());
         assert_eq!(req.head().connection_type(), ConnectionType::Upgrade);
@@ -932,62 +819,59 @@ mod tests {
 
     #[test]
     fn test_conn_upgrade_connect_method() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "CONNECT /test HTTP/1.1\r\n\
              content-type: text/plain\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
 
         assert!(req.upgrade());
     }
 
     #[test]
-    fn test_headers_bad_content_length() {
+    fn test_headers_content_length_err_1() {
-        // string CL
+        let mut buf = BytesMut::from(
-        expect_parse_err!(&mut BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              content-length: line\r\n\r\n",
-        ));
+        );
 
-        // negative CL
+        expect_parse_err!(&mut buf)
-        expect_parse_err!(&mut BytesMut::from(
-            "GET /test HTTP/1.1\r\n\
-             content-length: -1\r\n\r\n",
-        ));
     }
 
     #[test]
-    fn octal_ish_cl_parsed_as_decimal() {
+    fn test_headers_content_length_err_2() {
         let mut buf = BytesMut::from(
-            "POST /test HTTP/1.1\r\n\
+            "GET /test HTTP/1.1\r\n\
-             content-length: 011\r\n\r\n",
+             content-length: -1\r\n\r\n",
         );
-        let mut reader = MessageDecoder::<Request>::default();
+
-        let (_req, pl) = reader.decode(&mut buf).unwrap().unwrap();
+        expect_parse_err!(&mut buf);
-        assert!(matches!(
-            pl,
-            PayloadType::Payload(pl) if pl == PayloadDecoder::length(11)
-        ));
     }
 
     #[test]
     fn test_invalid_header() {
-        expect_parse_err!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              test line\r\n\r\n",
-        ));
+        );
+
+        expect_parse_err!(&mut buf);
     }
 
     #[test]
     fn test_invalid_name() {
-        expect_parse_err!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              test[]: line\r\n\r\n",
-        ));
+        );
+
+        expect_parse_err!(&mut buf);
     }
 
     #[test]
     fn test_http_request_bad_status_line() {
-        expect_parse_err!(&mut BytesMut::from("getpath \r\n\r\n"));
+        let mut buf = BytesMut::from("getpath \r\n\r\n");
+        expect_parse_err!(&mut buf);
     }
 
     #[test]
@@ -1027,10 +911,11 @@ mod tests {
 
     #[test]
     fn test_http_request_parser_utf8() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              x-test: тест\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
 
         assert_eq!(
             req.headers().get("x-test").unwrap().as_bytes(),
@@ -1040,18 +925,24 @@ mod tests {
 
     #[test]
     fn test_http_request_parser_two_slashes() {
-        let req = parse_ready!(&mut BytesMut::from("GET //path HTTP/1.1\r\n\r\n"));
+        let mut buf = BytesMut::from("GET //path HTTP/1.1\r\n\r\n");
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.path(), "//path");
     }
 
     #[test]
     fn test_http_request_parser_bad_method() {
-        expect_parse_err!(&mut BytesMut::from("!12%()+=~$ /get HTTP/1.1\r\n\r\n"));
+        let mut buf = BytesMut::from("!12%()+=~$ /get HTTP/1.1\r\n\r\n");
+
+        expect_parse_err!(&mut buf);
     }
 
     #[test]
     fn test_http_request_parser_bad_version() {
-        expect_parse_err!(&mut BytesMut::from("GET //get HT/11\r\n\r\n"));
+        let mut buf = BytesMut::from("GET //get HT/11\r\n\r\n");
+
+        expect_parse_err!(&mut buf);
     }
 
     #[test]
@@ -1068,66 +959,29 @@ mod tests {
 
     #[test]
     fn hrs_multiple_content_length() {
-        expect_parse_err!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET / HTTP/1.1\r\n\
             Host: example.com\r\n\
             Content-Length: 4\r\n\
             Content-Length: 2\r\n\
             \r\n\
             abcd",
-        ));
+        );
 
-        expect_parse_err!(&mut BytesMut::from(
+        expect_parse_err!(&mut buf);
-            "GET / HTTP/1.1\r\n\
-            Host: example.com\r\n\
-            Content-Length: 0\r\n\
-            Content-Length: 2\r\n\
-            \r\n\
-            ab",
-        ));
     }
 
     #[test]
     fn hrs_content_length_plus() {
-        expect_parse_err!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET / HTTP/1.1\r\n\
             Host: example.com\r\n\
             Content-Length: +3\r\n\
             \r\n\
             000",
-        ));
-    }
-
-    #[test]
-    fn hrs_te_http10() {
-        // in HTTP/1.0 transfer encoding is ignored and must therefore contain a CL header
-
-        expect_parse_err!(&mut BytesMut::from(
-            "POST / HTTP/1.0\r\n\
-            Host: example.com\r\n\
-            Transfer-Encoding: chunked\r\n\
-            \r\n\
-            3\r\n\
-            aaa\r\n\
-            0\r\n\
-            ",
-        ));
-    }
-
-    #[test]
-    fn hrs_cl_and_te_http10() {
-        // in HTTP/1.0 transfer encoding is simply ignored so it's fine to have both
-
-        let mut buf = BytesMut::from(
-            "GET / HTTP/1.0\r\n\
-            Host: example.com\r\n\
-            Content-Length: 3\r\n\
-            Transfer-Encoding: chunked\r\n\
-            \r\n\
-            000",
         );
 
-        parse_ready!(&mut buf);
+        expect_parse_err!(&mut buf);
     }
 
     #[test]

actix-http/src/h1/dispatcher.rs

@@ -8,24 +8,14 @@ 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 super::{
-    codec::Codec,
-    decoder::MAX_BUFFER_SIZE,
-    payload::{Payload, PayloadSender, PayloadStatus},
-    timer::TimerState,
-    Message, MessageType,
-};
 use crate::{
     body::{BodySize, BoxBody, MessageBody},
     config::ServiceConfig,
@@ -34,12 +24,19 @@ use crate::{
     Error, Extensions, OnConnectData, Request, Response, StatusCode,
 };
 
+use super::{
+    codec::Codec,
+    decoder::MAX_BUFFER_SIZE,
+    payload::{Payload, PayloadSender, PayloadStatus},
+    timer::TimerState,
+    Message, MessageType,
+};
+
 const LW_BUFFER_SIZE: usize = 1024;
 const HW_BUFFER_SIZE: usize = 1024 * 8;
 const MAX_PIPELINED_MESSAGES: usize = 16;
 
 bitflags! {
-    #[derive(Debug, Clone, Copy)]
     pub struct Flags: u8 {
         /// Set when stream is read for first time.
         const STARTED          = 0b0000_0001;
@@ -154,8 +151,7 @@ pin_project! {
         error: Option<DispatchError>,
 
         #[pin]
-        pub(super) state: State<S, B, X>,
+        state: State<S, B, X>,
-        // when Some(_) dispatcher is in state of receiving request payload
         payload: Option<PayloadSender>,
         messages: VecDeque<DispatcherMessage>,
 
@@ -178,7 +174,7 @@ enum DispatcherMessage {
 
 pin_project! {
     #[project = StateProj]
-    pub(super) enum State<S, B, X>
+    enum State<S, B, X>
     where
         S: Service<Request>,
         X: Service<Request, Response = Request>,
@@ -198,7 +194,7 @@ where
     X: Service<Request, Response = Request>,
     B: MessageBody,
 {
-    pub(super) fn is_none(&self) -> bool {
+    fn is_none(&self) -> bool {
         matches!(self, State::None)
     }
 }
@@ -212,7 +208,9 @@ where
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::None => write!(f, "State::None"),
-            Self::ExpectCall { .. } => f.debug_struct("State::ExpectCall").finish_non_exhaustive(),
+            Self::ExpectCall { .. } => {
+                f.debug_struct("State::ExpectCall").finish_non_exhaustive()
+            }
             Self::ServiceCall { .. } => {
                 f.debug_struct("State::ServiceCall").finish_non_exhaustive()
             }
@@ -273,7 +271,9 @@ where
 
                     head_timer: TimerState::new(config.client_request_deadline().is_some()),
                     ka_timer: TimerState::new(config.keep_alive().enabled()),
-                    shutdown_timer: TimerState::new(config.client_disconnect_deadline().is_some()),
+                    shutdown_timer: TimerState::new(
+                        config.client_disconnect_deadline().is_some(),
+                    ),
 
                     io: Some(io),
                     read_buf: BytesMut::with_capacity(HW_BUFFER_SIZE),
@@ -335,7 +335,7 @@ where
         while written < len {
             match io.as_mut().poll_write(cx, &write_buf[written..])? {
                 Poll::Ready(0) => {
-                    error!("write zero; closing");
+                    log::error!("write zero; closing");
                     return Poll::Ready(Err(io::Error::new(io::ErrorKind::WriteZero, "")));
                 }
 
@@ -374,6 +374,8 @@ where
                 DispatchError::Io(err)
             })?;
 
+        this.flags.set(Flags::KEEP_ALIVE, this.codec.keep_alive());
+
         Ok(size)
     }
 
@@ -451,15 +453,12 @@ where
                     }
 
                     // return with upgrade request and poll it exclusively
-                    Some(DispatcherMessage::Upgrade(req)) => return Ok(PollResponse::Upgrade(req)),
+                    Some(DispatcherMessage::Upgrade(req)) => {
+                        return Ok(PollResponse::Upgrade(req))
+                    }
 
                     // all messages are dealt with
-                    None => {
+                    None => return Ok(PollResponse::DoNothing),
-                        // start keep-alive if last request allowed it
-                        this.flags.set(Flags::KEEP_ALIVE, this.codec.keep_alive());
-
-                        return Ok(PollResponse::DoNothing);
-                    }
                 },
 
                 StateProj::ServiceCall { fut } => {
@@ -512,10 +511,8 @@ where
                             }
 
                             Poll::Ready(Some(Err(err))) => {
-                                let err = err.into();
-                                tracing::error!("Response payload stream error: {err:?}");
                                 this.flags.insert(Flags::FINISHED);
-                                return Err(DispatchError::Body(err));
+                                return Err(DispatchError::Body(err.into()));
                             }
 
                             Poll::Pending => return Ok(PollResponse::DoNothing),
@@ -551,7 +548,6 @@ where
                             }
 
                             Poll::Ready(Some(Err(err))) => {
-                                tracing::error!("Response payload stream error: {err:?}");
                                 this.flags.insert(Flags::FINISHED);
                                 return Err(DispatchError::Body(
                                     Error::new_body().with_cause(err).into(),
@@ -568,7 +564,7 @@ where
                 }
 
                 StateProj::ExpectCall { fut } => {
-                    trace!("  calling expect service");
+                    log::trace!("  calling expect service");
 
                     match fut.poll(cx) {
                         // expect resolved. write continue to buffer and set InnerDispatcher state
@@ -671,7 +667,9 @@ where
                 }
 
                 _ => {
-                    unreachable!("State must be set to ServiceCall or ExceptCall in handle_request")
+                    unreachable!(
+                        "State must be set to ServiceCall or ExceptCall in handle_request"
+                    )
                 }
             }
         }
@@ -680,7 +678,10 @@ where
     /// Process one incoming request.
     ///
     /// Returns true if any meaningful work was done.
-    fn poll_request(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Result<bool, DispatchError> {
+    fn poll_request(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Result<bool, DispatchError> {
         let pipeline_queue_full = self.messages.len() >= MAX_PIPELINED_MESSAGES;
         let can_not_read = !self.can_read(cx);
 
@@ -693,7 +694,6 @@ where
 
         let mut updated = false;
 
-        // decode from read buf as many full requests as possible
         loop {
             match this.codec.decode(this.read_buf) {
                 Ok(Some(msg)) => {
@@ -706,7 +706,7 @@ where
 
                             req.head_mut().peer_addr = *this.peer_addr;
 
-                            req.conn_data.clone_from(this.conn_data);
+                            req.conn_data = this.conn_data.as_ref().map(Rc::clone);
 
                             match this.codec.message_type() {
                                 // request has no payload
@@ -746,7 +746,7 @@ where
                             if let Some(ref mut payload) = this.payload {
                                 payload.feed_data(chunk);
                             } else {
-                                error!("Internal server error: unexpected payload chunk");
+                                log::error!("Internal server error: unexpected payload chunk");
                                 this.flags.insert(Flags::READ_DISCONNECT);
                                 this.messages.push_back(DispatcherMessage::Error(
                                     Response::internal_server_error().drop_body(),
@@ -760,7 +760,7 @@ where
                             if let Some(mut payload) = this.payload.take() {
                                 payload.feed_eof();
                             } else {
-                                error!("Internal server error: unexpected eof");
+                                log::error!("Internal server error: unexpected eof");
                                 this.flags.insert(Flags::READ_DISCONNECT);
                                 this.messages.push_back(DispatcherMessage::Error(
                                     Response::internal_server_error().drop_body(),
@@ -777,7 +777,7 @@ where
                 Ok(None) => break,
 
                 Err(ParseError::Io(err)) => {
-                    trace!("I/O error: {}", &err);
+                    log::trace!("I/O error: {}", &err);
                     self.as_mut().client_disconnected();
                     this = self.as_mut().project();
                     *this.error = Some(DispatchError::Io(err));
@@ -785,7 +785,7 @@ where
                 }
 
                 Err(ParseError::TooLarge) => {
-                    trace!("request head was too big; returning 431 response");
+                    log::trace!("request head was too big; returning 431 response");
 
                     if let Some(mut payload) = this.payload.take() {
                         payload.set_error(PayloadError::Overflow);
@@ -805,7 +805,7 @@ where
                 }
 
                 Err(err) => {
-                    trace!("parse error {}", &err);
+                    log::trace!("parse error {}", &err);
 
                     if let Some(mut payload) = this.payload.take() {
                         payload.set_error(PayloadError::EncodingCorrupted);
@@ -836,7 +836,10 @@ where
             if timer.as_mut().poll(cx).is_ready() {
                 // timeout on first request (slow request) return 408
 
-                trace!("timed out on slow request; replying with 408 and closing connection");
+                log::trace!(
+                    "timed out on slow request; \
+                        replying with 408 and closing connection"
+                );
 
                 let _ = self.as_mut().send_error_response(
                     Response::with_body(StatusCode::REQUEST_TIMEOUT, ()),
@@ -850,7 +853,10 @@ where
         Ok(())
     }
 
-    fn poll_ka_timer(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Result<(), DispatchError> {
+    fn poll_ka_timer(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Result<(), DispatchError> {
         let this = self.as_mut().project();
         if let TimerState::Active { timer } = this.ka_timer {
             debug_assert!(
@@ -862,21 +868,15 @@ where
                 "dispatcher should not be in keep-alive phase if state is not none: {:?}",
                 this.state,
             );
-
+            debug_assert!(
-            // Assert removed by @robjtede on account of issue #2655. There are cases where an I/O
+                this.write_buf.is_empty(),
-            // flush can be pending after entering the keep-alive state causing the subsequent flush
+                "dispatcher should not be in keep-alive phase if write_buf is not empty",
-            // wake up to panic here. This appears to be a Linux-only problem. Leaving original code
+            );
-            // below for posterity because a simple and reliable test could not be found to trigger
-            // the behavior.
-            // debug_assert!(
-            //     this.write_buf.is_empty(),
-            //     "dispatcher should not be in keep-alive phase if write_buf is not empty",
-            // );
 
             // keep-alive timer has timed out
             if timer.as_mut().poll(cx).is_ready() {
                 // no tasks at hand
-                trace!("timer timed out; closing connection");
+                log::trace!("timer timed out; closing connection");
                 this.flags.insert(Flags::SHUTDOWN);
 
                 if let Some(deadline) = this.config.client_disconnect_deadline() {
@@ -906,7 +906,7 @@ where
 
             // timed-out during shutdown; drop connection
             if timer.as_mut().poll(cx).is_ready() {
-                trace!("timed-out during shutdown");
+                log::trace!("timed-out during shutdown");
                 return Err(DispatchError::DisconnectTimeout);
             }
         }
@@ -915,7 +915,10 @@ where
     }
 
     /// Poll head, keep-alive, and disconnect timer.
-    fn poll_timers(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Result<(), DispatchError> {
+    fn poll_timers(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Result<(), DispatchError> {
         self.as_mut().poll_head_timer(cx)?;
         self.as_mut().poll_ka_timer(cx)?;
         self.as_mut().poll_shutdown_timer(cx)?;
@@ -929,7 +932,10 @@ where
     /// - `std::io::ErrorKind::ConnectionReset` after partial read;
     /// - all data read done.
     #[inline(always)] // TODO: bench this inline
-    fn read_available(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Result<bool, DispatchError> {
+    fn read_available(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Result<bool, DispatchError> {
         let this = self.project();
 
         if this.flags.contains(Flags::READ_DISCONNECT) {
@@ -961,11 +967,9 @@ where
                 //
                 // A Request head too large to parse is only checked on `httparse::Status::Partial`.
 
-                match this.payload {
+                if this.payload.is_none() {
-                    // When dispatcher has a payload the responsibility of wake ups is shifted to
+                    // When dispatcher has a payload the responsibility of wake up it would be shift
-                    // `h1::payload::Payload` unless the payload is needing a read, in which case it
+                    // to h1::payload::Payload.
-                    // might not have access to the waker and could result in the dispatcher
-                    // getting stuck until timeout.
                     //
                     // Reason:
                     // Self wake up when there is payload would waste poll and/or result in
@@ -976,8 +980,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);
@@ -989,7 +992,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);
 
@@ -1062,12 +1065,12 @@ where
 
         match this.inner.project() {
             DispatcherStateProj::Upgrade { fut: upgrade } => upgrade.poll(cx).map_err(|err| {
-                error!("Upgrade handler error: {}", err);
+                log::error!("Upgrade handler error: {}", err);
                 DispatchError::Upgrade
             }),
 
             DispatcherStateProj::Normal { mut inner } => {
-                trace!("start flags: {:?}", &inner.flags);
+                log::trace!("start flags: {:?}", &inner.flags);
 
                 trace_timer_states(
                     "start",
@@ -1174,7 +1177,7 @@ where
 
                     // client is gone
                     if inner.flags.contains(Flags::WRITE_DISCONNECT) {
-                        trace!("client is gone; disconnecting");
+                        log::trace!("client is gone; disconnecting");
                         return Poll::Ready(Ok(()));
                     }
 
@@ -1183,14 +1186,14 @@ where
 
                     // read half is closed; we do not process any responses
                     if inner_p.flags.contains(Flags::READ_DISCONNECT) && state_is_none {
-                        trace!("read half closed; start shutdown");
+                        log::trace!("read half closed; start shutdown");
                         inner_p.flags.insert(Flags::SHUTDOWN);
                     }
 
                     // keep-alive and stream errors
                     if state_is_none && inner_p.write_buf.is_empty() {
                         if let Some(err) = inner_p.error.take() {
-                            error!("stream error: {}", &err);
+                            log::error!("stream error: {}", &err);
                             return Poll::Ready(Err(err));
                         }
 
@@ -1219,7 +1222,7 @@ where
                     Poll::Pending
                 };
 
-                trace!("end flags: {:?}", &inner.flags);
+                log::trace!("end flags: {:?}", &inner.flags);
 
                 poll
             }
@@ -1234,17 +1237,17 @@ fn trace_timer_states(
     ka_timer: &TimerState,
     shutdown_timer: &TimerState,
 ) {
-    trace!("{} timers:", label);
+    log::trace!("{} timers:", label);
 
     if head_timer.is_enabled() {
-        trace!("  head {}", &head_timer);
+        log::trace!("  head {}", &head_timer);
     }
 
     if ka_timer.is_enabled() {
-        trace!("  keep-alive {}", &ka_timer);
+        log::trace!("  keep-alive {}", &ka_timer);
     }
 
     if shutdown_timer.is_enabled() {
-        trace!("  shutdown {}", &shutdown_timer);
+        log::trace!("  shutdown {}", &shutdown_timer);
     }
 }

actix-http/src/h1/dispatcher_tests.rs

@@ -1,12 +1,15 @@
 use std::{future::Future, str, task::Poll, time::Duration};
 
-use actix_codec::Framed;
+use actix_rt::time::sleep;
-use actix_rt::{pin, time::sleep};
+use actix_service::fn_service;
-use actix_service::{fn_service, Service};
 use actix_utils::future::{ready, Ready};
-use bytes::{Buf, Bytes, BytesMut};
+use bytes::Bytes;
 use futures_util::future::lazy;
 
+use actix_codec::Framed;
+use actix_service::Service;
+use bytes::{Buf, BytesMut};
+
 use super::dispatcher::{Dispatcher, DispatcherState, DispatcherStateProj, Flags};
 use crate::{
     body::MessageBody,
@@ -40,8 +43,8 @@ fn status_service(
     fn_service(move |_req: Request| ready(Ok::<_, Error>(Response::new(status))))
 }
 
-fn echo_path_service() -> impl Service<Request, Response = Response<impl MessageBody>, Error = Error>
+fn echo_path_service(
-{
+) -> impl Service<Request, Response = Response<impl MessageBody>, Error = Error> {
     fn_service(|req: Request| {
         let path = req.path().as_bytes();
         ready(Ok::<_, Error>(
@@ -50,18 +53,10 @@ fn echo_path_service() -> impl Service<Request, Response = Response<impl Message
     })
 }
 
-fn drop_payload_service() -> impl Service<Request, Response = Response<&'static str>, Error = Error>
-{
-    fn_service(|mut req: Request| async move {
-        let _ = req.take_payload();
-        Ok::<_, Error>(Response::with_body(StatusCode::OK, "payload dropped"))
-    })
-}
-
 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();
@@ -94,7 +89,7 @@ async fn late_request() {
         None,
         OnConnectData::default(),
     );
-    pin!(h1);
+    actix_rt::pin!(h1);
 
     lazy(|cx| {
         assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
@@ -161,7 +156,7 @@ async fn oneshot_connection() {
         None,
         OnConnectData::default(),
     );
-    pin!(h1);
+    actix_rt::pin!(h1);
 
     lazy(|cx| {
         assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
@@ -178,16 +173,13 @@ async fn oneshot_connection() {
         stabilize_date_header(&mut res);
         let res = &res[..];
 
-        let exp = http_msg(
+        let exp = b"\
-            r"
+                HTTP/1.1 200 OK\r\n\
-            HTTP/1.1 200 OK
+                content-length: 5\r\n\
-            content-length: 5
+                connection: close\r\n\
-            connection: close
+                date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\r\n\
-            date: Thu, 01 Jan 1970 12:34:56 UTC
+                /abcd\
-
+                ";
-            /abcd
-            ",
-        );
 
         assert_eq!(
             res,
@@ -196,7 +188,7 @@ async fn oneshot_connection() {
                response: {:?}\n\
                expected: {:?}",
             String::from_utf8_lossy(res),
-            String::from_utf8_lossy(&exp)
+            String::from_utf8_lossy(exp)
         );
     })
     .await;
@@ -222,7 +214,7 @@ async fn keep_alive_timeout() {
         None,
         OnConnectData::default(),
     );
-    pin!(h1);
+    actix_rt::pin!(h1);
 
     lazy(|cx| {
         assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
@@ -301,7 +293,7 @@ async fn keep_alive_follow_up_req() {
         None,
         OnConnectData::default(),
     );
-    pin!(h1);
+    actix_rt::pin!(h1);
 
     lazy(|cx| {
         assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
@@ -421,7 +413,7 @@ async fn req_parse_err() {
             OnConnectData::default(),
         );
 
-        pin!(h1);
+        actix_rt::pin!(h1);
 
         match h1.as_mut().poll(cx) {
             Poll::Pending => panic!(),
@@ -467,7 +459,7 @@ async fn pipelining_ok_then_ok() {
             OnConnectData::default(),
         );
 
-        pin!(h1);
+        actix_rt::pin!(h1);
 
         assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
 
@@ -537,7 +529,7 @@ async fn pipelining_ok_then_bad() {
             OnConnectData::default(),
         );
 
-        pin!(h1);
+        actix_rt::pin!(h1);
 
         assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
 
@@ -609,7 +601,7 @@ async fn expect_handling() {
                 ",
         );
 
-        pin!(h1);
+        actix_rt::pin!(h1);
 
         assert!(h1.as_mut().poll(cx).is_pending());
         assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
@@ -634,7 +626,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!(
@@ -686,7 +678,7 @@ async fn expect_eager() {
                 ",
         );
 
-        pin!(h1);
+        actix_rt::pin!(h1);
 
         assert!(h1.as_mut().poll(cx).is_ready());
         assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
@@ -696,7 +688,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
@@ -769,7 +761,7 @@ async fn upgrade_handling() {
                 ",
         );
 
-        pin!(h1);
+        actix_rt::pin!(h1);
 
         assert!(h1.as_mut().poll(cx).is_ready());
         assert!(matches!(&h1.inner, DispatcherState::Upgrade { .. }));
@@ -779,194 +771,3 @@ async fn upgrade_handling() {
     })
     .await;
 }
-
-// fix in #2624 reverted temporarily
-// complete fix tracked in #2745
-#[ignore]
-#[actix_rt::test]
-async fn handler_drop_payload() {
-    let _ = env_logger::try_init();
-
-    let mut buf = TestBuffer::new(http_msg(
-        r"
-        POST /drop-payload HTTP/1.1
-        Content-Length: 3
-        
-        abc
-        ",
-    ));
-
-    let services = HttpFlow::new(
-        drop_payload_service(),
-        ExpectHandler,
-        None::<UpgradeHandler>,
-    );
-
-    let h1 = Dispatcher::new(
-        buf.clone(),
-        services,
-        ServiceConfig::default(),
-        None,
-        OnConnectData::default(),
-    );
-    pin!(h1);
-
-    lazy(|cx| {
-        assert!(h1.as_mut().poll(cx).is_pending());
-
-        // polls: manual
-        assert_eq!(h1.poll_count, 1);
-
-        let mut res = BytesMut::from(buf.take_write_buf().as_ref());
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        let exp = http_msg(
-            r"
-            HTTP/1.1 200 OK
-            content-length: 15
-            date: Thu, 01 Jan 1970 12:34:56 UTC
-
-            payload dropped
-            ",
-        );
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(&exp)
-        );
-
-        if let DispatcherStateProj::Normal { inner } = h1.as_mut().project().inner.project() {
-            assert!(inner.state.is_none());
-        }
-    })
-    .await;
-
-    lazy(|cx| {
-        // add message that claims to have payload longer than provided
-        buf.extend_read_buf(http_msg(
-            r"
-            POST /drop-payload HTTP/1.1
-            Content-Length: 200
-            
-            abc
-            ",
-        ));
-
-        assert!(h1.as_mut().poll(cx).is_pending());
-
-        // polls: manual => manual
-        assert_eq!(h1.poll_count, 2);
-
-        let mut res = BytesMut::from(buf.take_write_buf().as_ref());
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        // expect response immediately even though request side has not finished reading payload
-        let exp = http_msg(
-            r"
-            HTTP/1.1 200 OK
-            content-length: 15
-            date: Thu, 01 Jan 1970 12:34:56 UTC
-
-            payload dropped
-            ",
-        );
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(&exp)
-        );
-    })
-    .await;
-
-    lazy(|cx| {
-        assert!(h1.as_mut().poll(cx).is_ready());
-
-        // polls: manual => manual => manual
-        assert_eq!(h1.poll_count, 3);
-
-        let mut res = BytesMut::from(buf.take_write_buf().as_ref());
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        // expect that unrequested error response is sent back since connection could not be cleaned
-        let exp = http_msg(
-            r"
-            HTTP/1.1 500 Internal Server Error
-            content-length: 0
-            connection: close
-            date: Thu, 01 Jan 1970 12:34:56 UTC
-
-            ",
-        );
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(&exp)
-        );
-    })
-    .await;
-}
-
-fn http_msg(msg: impl AsRef<str>) -> BytesMut {
-    let mut msg = msg
-        .as_ref()
-        .trim()
-        .split('\n')
-        .map(|line| [line.trim_start(), "\r"].concat())
-        .collect::<Vec<_>>()
-        .join("\n");
-
-    // remove trailing \r
-    msg.pop();
-
-    if !msg.is_empty() && !msg.contains("\r\n\r\n") {
-        msg.push_str("\r\n\r\n");
-    }
-
-    BytesMut::from(msg.as_bytes())
-}
-
-#[test]
-fn http_msg_creates_msg() {
-    assert_eq!(http_msg(r""), "");
-
-    assert_eq!(
-        http_msg(
-            r"
-            POST / HTTP/1.1
-            Content-Length: 3
-            
-            abc
-            "
-        ),
-        "POST / HTTP/1.1\r\nContent-Length: 3\r\n\r\nabc"
-    );
-
-    assert_eq!(
-        http_msg(
-            r"
-            GET / HTTP/1.1
-            Content-Length: 3
-            
-            "
-        ),
-        "GET / HTTP/1.1\r\nContent-Length: 3\r\n\r\n"
-    );
-}

actix-http/src/h1/encoder.rs

@@ -210,14 +210,14 @@ pub(crate) trait MessageType: Sized {
             dst.advance_mut(pos);
         }
 
+        // optimized date header, set_date writes \r\n
         if !has_date {
-            // optimized date header, write_date_header writes its own \r\n
             config.write_date_header(dst, camel_case);
+        } else {
+            // msg eof
+            dst.extend_from_slice(b"\r\n");
         }
 
-        // end-of-headers marker
-        dst.extend_from_slice(b"\r\n");
-
         Ok(())
     }
 
@@ -313,7 +313,7 @@ impl MessageType for RequestHeadType {
                 _ => return Err(io::Error::new(io::ErrorKind::Other, "unsupported version")),
             }
         )
-        .map_err(|err| io::Error::new(io::ErrorKind::Other, err))
+        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
     }
 }
 
@@ -433,7 +433,7 @@ impl TransferEncoding {
                     buf.extend_from_slice(b"0\r\n\r\n");
                 } else {
                     writeln!(helpers::MutWriter(buf), "{:X}\r", msg.len())
-                        .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
+                        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
 
                     buf.reserve(msg.len() + 2);
                     buf.extend_from_slice(msg);
@@ -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)
@@ -517,7 +517,6 @@ unsafe fn write_camel_case(value: &[u8], buf: *mut u8, len: usize) {
             if let Some(c @ b'a'..=b'z') = iter.next() {
                 buffer[index] = c & 0b1101_1111;
             }
-            index += 1;
         }
 
         index += 1;
@@ -529,7 +528,7 @@ mod tests {
     use std::rc::Rc;
 
     use bytes::Bytes;
-    use http::header::{AUTHORIZATION, UPGRADE_INSECURE_REQUESTS};
+    use http::header::AUTHORIZATION;
 
     use super::*;
     use crate::{
@@ -560,9 +559,6 @@ mod tests {
         head.headers
             .insert(CONTENT_TYPE, HeaderValue::from_static("plain/text"));
 
-        head.headers
-            .insert(UPGRADE_INSECURE_REQUESTS, HeaderValue::from_static("1"));
-
         let mut head = RequestHeadType::Owned(head);
 
         let _ = head.encode_headers(
@@ -578,7 +574,6 @@ mod tests {
         assert!(data.contains("Connection: close\r\n"));
         assert!(data.contains("Content-Type: plain/text\r\n"));
         assert!(data.contains("Date: date\r\n"));
-        assert!(data.contains("Upgrade-Insecure-Requests: 1\r\n"));
 
         let _ = head.encode_headers(
             &mut bytes,

actix-http/src/h1/mod.rs

@@ -17,16 +17,14 @@ mod timer;
 mod upgrade;
 mod utils;
 
-pub use self::{
+pub use self::client::{ClientCodec, ClientPayloadCodec};
-    client::{ClientCodec, ClientPayloadCodec},
+pub use self::codec::Codec;
-    codec::Codec,
+pub use self::dispatcher::Dispatcher;
-    dispatcher::Dispatcher,
+pub use self::expect::ExpectHandler;
-    expect::ExpectHandler,
+pub use self::payload::Payload;
-    payload::Payload,
+pub use self::service::{H1Service, H1ServiceHandler};
-    service::{H1Service, H1ServiceHandler},
+pub use self::upgrade::UpgradeHandler;
-    upgrade::UpgradeHandler,
+pub use self::utils::SendResponse;
-    utils::SendResponse,
-};
 
 #[derive(Debug)]
 /// Codec message

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,
@@ -117,7 +117,6 @@ impl PayloadSender {
         }
     }
 
-    #[allow(clippy::needless_pass_by_ref_mut)]
     #[inline]
     pub fn need_read(&self, cx: &mut Context<'_>) -> PayloadStatus {
         // we check need_read only if Payload (other side) is alive,
@@ -175,7 +174,7 @@ impl Inner {
 
     /// Register future waiting data from payload.
     /// Waker would be used in `Inner::wake`
-    fn register(&mut self, cx: &Context<'_>) {
+    fn register(&mut self, cx: &mut Context<'_>) {
         if self
             .task
             .as_ref()
@@ -187,7 +186,7 @@ impl Inner {
 
     // Register future feeding data to payload.
     /// Waker would be used in `Inner::wake_io`
-    fn register_io(&mut self, cx: &Context<'_>) {
+    fn register_io(&mut self, cx: &mut Context<'_>) {
         if self
             .io_task
             .as_ref()
@@ -222,7 +221,7 @@ impl Inner {
 
     fn poll_next(
         mut self: Pin<&mut Self>,
-        cx: &Context<'_>,
+        cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, PayloadError>>> {
         if let Some(data) = self.items.pop_front() {
             self.len -= data.len();
@@ -253,15 +252,18 @@ 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);
+    assert_not_impl_any!(Inner: UnwindSafe, RefUnwindSafe);
 
     #[actix_rt::test]
     async fn test_unread_data() {

actix-http/src/h1/service.rs

@@ -13,9 +13,7 @@ use actix_service::{
 };
 use actix_utils::future::ready;
 use futures_core::future::LocalBoxFuture;
-use tracing::error;
 
-use super::{codec::Codec, dispatcher::Dispatcher, ExpectHandler, UpgradeHandler};
 use crate::{
     body::{BoxBody, MessageBody},
     config::ServiceConfig,
@@ -24,6 +22,8 @@ use crate::{
     ConnectCallback, OnConnectData, Request, Response,
 };
 
+use super::{codec::Codec, dispatcher::Dispatcher, ExpectHandler, UpgradeHandler};
+
 /// `ServiceFactory` implementation for HTTP1 transport
 pub struct H1Service<T, S, B, X = ExpectHandler, U = UpgradeHandler> {
     srv: S,
@@ -81,8 +81,13 @@ where
     /// Create simple tcp stream service
     pub fn tcp(
         self,
-    ) -> impl ServiceFactory<TcpStream, Config = (), Response = (), Error = DispatchError, InitError = ()>
+    ) -> impl ServiceFactory<
-    {
+        TcpStream,
+        Config = (),
+        Response = (),
+        Error = DispatchError,
+        InitError = (),
+    > {
         fn_service(|io: TcpStream| {
             let peer_addr = io.peer_addr().ok();
             ready(Ok((io, peer_addr)))
@@ -93,6 +98,8 @@ where
 
 #[cfg(feature = "openssl")]
 mod openssl {
+    use super::*;
+
     use actix_tls::accept::{
         openssl::{
             reexports::{Error as SslError, SslAcceptor},
@@ -101,8 +108,6 @@ mod openssl {
         TlsError,
     };
 
-    use super::*;
-
     impl<S, B, X, U> H1Service<TlsStream<TcpStream>, S, B, X, U>
     where
         S: ServiceFactory<Request, Config = ()>,
@@ -152,13 +157,14 @@ mod openssl {
     }
 }
 
-#[cfg(feature = "rustls-0_20")]
+#[cfg(feature = "rustls")]
-mod rustls_0_20 {
+mod rustls {
+
     use std::io;
 
     use actix_service::ServiceFactoryExt as _;
     use actix_tls::accept::{
-        rustls_0_20::{reexports::ServerConfig, Acceptor, TlsStream},
+        rustls::{reexports::ServerConfig, Acceptor, TlsStream},
         TlsError,
     };
 
@@ -188,7 +194,7 @@ mod rustls_0_20 {
         U::Error: fmt::Display + Into<Response<BoxBody>>,
         U::InitError: fmt::Debug,
     {
-        /// Create Rustls v0.20 based service.
+        /// Create Rustls based service.
         pub fn rustls(
             self,
             config: ServerConfig,
@@ -213,189 +219,6 @@ mod rustls_0_20 {
     }
 }
 
-#[cfg(feature = "rustls-0_21")]
-mod rustls_0_21 {
-    use std::io;
-
-    use actix_service::ServiceFactoryExt as _;
-    use actix_tls::accept::{
-        rustls_0_21::{reexports::ServerConfig, Acceptor, TlsStream},
-        TlsError,
-    };
-
-    use super::*;
-
-    impl<S, B, X, U> H1Service<TlsStream<TcpStream>, S, B, X, U>
-    where
-        S: ServiceFactory<Request, Config = ()>,
-        S::Future: 'static,
-        S::Error: Into<Response<BoxBody>>,
-        S::InitError: fmt::Debug,
-        S::Response: Into<Response<B>>,
-
-        B: MessageBody,
-
-        X: ServiceFactory<Request, Config = (), Response = Request>,
-        X::Future: 'static,
-        X::Error: Into<Response<BoxBody>>,
-        X::InitError: fmt::Debug,
-
-        U: ServiceFactory<
-            (Request, Framed<TlsStream<TcpStream>, Codec>),
-            Config = (),
-            Response = (),
-        >,
-        U::Future: 'static,
-        U::Error: fmt::Display + Into<Response<BoxBody>>,
-        U::InitError: fmt::Debug,
-    {
-        /// Create Rustls v0.21 based service.
-        pub fn rustls_021(
-            self,
-            config: ServerConfig,
-        ) -> impl ServiceFactory<
-            TcpStream,
-            Config = (),
-            Response = (),
-            Error = TlsError<io::Error, DispatchError>,
-            InitError = (),
-        > {
-            Acceptor::new(config)
-                .map_init_err(|_| {
-                    unreachable!("TLS acceptor service factory does not error on init")
-                })
-                .map_err(TlsError::into_service_error)
-                .map(|io: TlsStream<TcpStream>| {
-                    let peer_addr = io.get_ref().0.peer_addr().ok();
-                    (io, peer_addr)
-                })
-                .and_then(self.map_err(TlsError::Service))
-        }
-    }
-}
-
-#[cfg(feature = "rustls-0_22")]
-mod rustls_0_22 {
-    use std::io;
-
-    use actix_service::ServiceFactoryExt as _;
-    use actix_tls::accept::{
-        rustls_0_22::{reexports::ServerConfig, Acceptor, TlsStream},
-        TlsError,
-    };
-
-    use super::*;
-
-    impl<S, B, X, U> H1Service<TlsStream<TcpStream>, S, B, X, U>
-    where
-        S: ServiceFactory<Request, Config = ()>,
-        S::Future: 'static,
-        S::Error: Into<Response<BoxBody>>,
-        S::InitError: fmt::Debug,
-        S::Response: Into<Response<B>>,
-
-        B: MessageBody,
-
-        X: ServiceFactory<Request, Config = (), Response = Request>,
-        X::Future: 'static,
-        X::Error: Into<Response<BoxBody>>,
-        X::InitError: fmt::Debug,
-
-        U: ServiceFactory<
-            (Request, Framed<TlsStream<TcpStream>, Codec>),
-            Config = (),
-            Response = (),
-        >,
-        U::Future: 'static,
-        U::Error: fmt::Display + Into<Response<BoxBody>>,
-        U::InitError: fmt::Debug,
-    {
-        /// Create Rustls v0.22 based service.
-        pub fn rustls_0_22(
-            self,
-            config: ServerConfig,
-        ) -> impl ServiceFactory<
-            TcpStream,
-            Config = (),
-            Response = (),
-            Error = TlsError<io::Error, DispatchError>,
-            InitError = (),
-        > {
-            Acceptor::new(config)
-                .map_init_err(|_| {
-                    unreachable!("TLS acceptor service factory does not error on init")
-                })
-                .map_err(TlsError::into_service_error)
-                .map(|io: TlsStream<TcpStream>| {
-                    let peer_addr = io.get_ref().0.peer_addr().ok();
-                    (io, peer_addr)
-                })
-                .and_then(self.map_err(TlsError::Service))
-        }
-    }
-}
-
-#[cfg(feature = "rustls-0_23")]
-mod rustls_0_23 {
-    use std::io;
-
-    use actix_service::ServiceFactoryExt as _;
-    use actix_tls::accept::{
-        rustls_0_23::{reexports::ServerConfig, Acceptor, TlsStream},
-        TlsError,
-    };
-
-    use super::*;
-
-    impl<S, B, X, U> H1Service<TlsStream<TcpStream>, S, B, X, U>
-    where
-        S: ServiceFactory<Request, Config = ()>,
-        S::Future: 'static,
-        S::Error: Into<Response<BoxBody>>,
-        S::InitError: fmt::Debug,
-        S::Response: Into<Response<B>>,
-
-        B: MessageBody,
-
-        X: ServiceFactory<Request, Config = (), Response = Request>,
-        X::Future: 'static,
-        X::Error: Into<Response<BoxBody>>,
-        X::InitError: fmt::Debug,
-
-        U: ServiceFactory<
-            (Request, Framed<TlsStream<TcpStream>, Codec>),
-            Config = (),
-            Response = (),
-        >,
-        U::Future: 'static,
-        U::Error: fmt::Display + Into<Response<BoxBody>>,
-        U::InitError: fmt::Debug,
-    {
-        /// Create Rustls v0.23 based service.
-        pub fn rustls_0_23(
-            self,
-            config: ServerConfig,
-        ) -> impl ServiceFactory<
-            TcpStream,
-            Config = (),
-            Response = (),
-            Error = TlsError<io::Error, DispatchError>,
-            InitError = (),
-        > {
-            Acceptor::new(config)
-                .map_init_err(|_| {
-                    unreachable!("TLS acceptor service factory does not error on init")
-                })
-                .map_err(TlsError::into_service_error)
-                .map(|io: TlsStream<TcpStream>| {
-                    let peer_addr = io.get_ref().0.peer_addr().ok();
-                    (io, peer_addr)
-                })
-                .and_then(self.map_err(TlsError::Service))
-        }
-    }
-}
-
 impl<T, S, B, X, U> H1Service<T, S, B, X, U>
 where
     S: ServiceFactory<Request, Config = ()>,
@@ -480,15 +303,15 @@ where
         let cfg = self.cfg.clone();
 
         Box::pin(async move {
-            let expect = expect.await.map_err(|err| {
+            let expect = expect
-                tracing::error!("Initialization of HTTP expect service error: {err:?}");
+                .await
-            })?;
+                .map_err(|e| log::error!("Init http expect service error: {:?}", e))?;
 
             let upgrade = match upgrade {
                 Some(upgrade) => {
-                    let upgrade = upgrade.await.map_err(|err| {
+                    let upgrade = upgrade
-                        tracing::error!("Initialization of HTTP upgrade service error: {err:?}");
+                        .await
-                    })?;
+                        .map_err(|e| log::error!("Init http upgrade service error: {:?}", e))?;
                     Some(upgrade)
                 }
                 None => None,
@@ -496,7 +319,7 @@ where
 
             let service = service
                 .await
-                .map_err(|err| error!("Initialization of HTTP service error: {err:?}"))?;
+                .map_err(|e| log::error!("Init http service error: {:?}", e))?;
 
             Ok(H1ServiceHandler::new(
                 cfg,
@@ -534,13 +357,13 @@ where
 
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self._poll_ready(cx).map_err(|err| {
-            error!("HTTP/1 service readiness error: {:?}", err);
+            log::error!("HTTP/1 service readiness error: {:?}", err);
             DispatchError::Service(err)
         })
     }
 
     fn call(&self, (io, addr): (T, Option<net::SocketAddr>)) -> Self::Future {
         let conn_data = OnConnectData::from_io(&io, self.on_connect_ext.as_deref());
-        Dispatcher::new(io, Rc::clone(&self.flow), self.cfg.clone(), addr, conn_data)
+        Dispatcher::new(io, self.flow.clone(), self.cfg.clone(), addr, conn_data)
     }
 }

actix-http/src/h1/timer.rs

@@ -1,7 +1,6 @@
 use std::{fmt, future::Future, pin::Pin, task::Context};
 
 use actix_rt::time::{Instant, Sleep};
-use tracing::trace;
 
 #[derive(Debug)]
 pub(super) enum TimerState {
@@ -25,7 +24,7 @@ impl TimerState {
 
     pub(super) fn set(&mut self, timer: Sleep, line: u32) {
         if matches!(self, Self::Disabled) {
-            trace!("setting disabled timer from line {}", line);
+            log::trace!("setting disabled timer from line {}", line);
         }
 
         *self = Self::Active {
@@ -40,11 +39,11 @@ impl TimerState {
 
     pub(super) fn clear(&mut self, line: u32) {
         if matches!(self, Self::Disabled) {
-            trace!("trying to clear a disabled timer from line {}", line);
+            log::trace!("trying to clear a disabled timer from line {}", line);
         }
 
         if matches!(self, Self::Inactive) {
-            trace!("trying to clear an inactive timer from line {}", line);
+            log::trace!("trying to clear an inactive timer from line {}", line);
         }
 
         *self = Self::Inactive;

actix-http/src/h2/dispatcher.rs

@@ -4,7 +4,7 @@ use std::{
     future::Future,
     marker::PhantomData,
     net,
-    pin::{pin, Pin},
+    pin::Pin,
     rc::Rc,
     task::{Context, Poll},
 };
@@ -19,16 +19,15 @@ use h2::{
     server::{Connection, SendResponse},
     Ping, PingPong,
 };
+use log::{error, trace};
 use pin_project_lite::pin_project;
 
 use crate::{
     body::{BodySize, BoxBody, MessageBody},
     config::ServiceConfig,
-    header::{
+    header::{HeaderValue, CONNECTION, CONTENT_LENGTH, DATE, TRANSFER_ENCODING},
-        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;
@@ -66,7 +65,7 @@ where
                     timer
                 })
                 .unwrap_or_else(|| Box::pin(sleep(dur))),
-            in_flight: false,
+            on_flight: false,
             ping_pong: conn.ping_pong().unwrap(),
         });
 
@@ -83,14 +82,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>
@@ -117,7 +111,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;
@@ -126,7 +119,7 @@ where
                     head.headers = parts.headers.into();
                     head.peer_addr = this.peer_addr;
 
-                    req.conn_data.clone_from(&this.conn_data);
+                    req.conn_data = this.conn_data.as_ref().map(Rc::clone);
 
                     let fut = this.flow.service.call(req);
                     let config = this.config.clone();
@@ -135,10 +128,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
                             }
                         };
 
@@ -146,41 +139,37 @@ where
                         if let Err(err) = res {
                             match err {
                                 DispatchError::SendResponse(err) => {
-                                    tracing::trace!("Error sending response: {err:?}");
+                                    trace!("Error sending HTTP/2 response: {:?}", err)
-                                }
-                                DispatchError::SendData(err) => {
-                                    tracing::warn!("Send data error: {err:?}");
                                 }
+                                DispatchError::SendData(err) => log::warn!("{:?}", err),
                                 DispatchError::ResponseBody(err) => {
-                                    tracing::error!("Response payload stream error: {err:?}");
+                                    error!("Response payload stream error: {:?}", err)
                                 }
                             }
                         }
                     });
                 }
                 Poll::Ready(None) => return Poll::Ready(Ok(())),
-
                 Poll::Pending => match this.ping_pong.as_mut() {
                     Some(ping_pong) => loop {
-                        if ping_pong.in_flight {
+                        if ping_pong.on_flight {
-                            // When there is an in-flight ping-pong, poll pong and and keep-alive
+                            // When have on flight ping pong. poll pong and and keep alive timer.
-                            // timer. On successful pong received, update keep-alive timer to
+                            // on success pong received update keep alive timer to determine the next timing of
-                            // determine the next timing of ping pong.
+                            // 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
+                            // When there is no on flight ping pong. keep alive timer is used to wait for next
-                            // wait for next timing of ping-pong. Therefore, at this point it serves
+                            // timing of ping pong. Therefore at this point it serves as an interval instead.
-                            // as an interval instead.
                             ready!(ping_pong.timer.as_mut().poll(cx));
 
                             ping_pong.ping_pong.send_ping(Ping::opaque())?;
@@ -188,7 +177,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,
@@ -208,7 +197,6 @@ async fn handle_response<B>(
     res: Response<B>,
     mut tx: SendResponse<Bytes>,
     config: ServiceConfig,
-    head_req: bool,
 ) -> Result<(), DispatchError>
 where
     B: MessageBody,
@@ -218,20 +206,20 @@ 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(());
     }
 
-    let mut body = pin!(body);
-
     // poll response body and send chunks to client
+    actix_rt::pin!(body);
+
     while let Some(res) = poll_fn(|cx| body.as_mut().poll_next(cx)).await {
         let mut chunk = res.map_err(|err| DispatchError::ResponseBody(err.into()))?;
 
@@ -297,13 +285,13 @@ fn prepare_response(
         _ => {}
     }
 
-    match size {
+    let _ = match size {
-        BodySize::None | BodySize::Stream => {}
+        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) => {
@@ -312,28 +300,19 @@ fn prepare_response(
             res.headers_mut().insert(
                 CONTENT_LENGTH,
                 HeaderValue::from_str(buf.format(*len)).unwrap(),
-            );
+            )
         }
     };
 
     // copy headers
     for (key, value) in head.headers.iter() {
-        match key {
+        match *key {
-            // omit HTTP/1.x only headers according to:
+            // TODO: consider skipping other headers according to:
-            // https://datatracker.ietf.org/doc/html/rfc7540#section-8.1.2.2
+            //       https://datatracker.ietf.org/doc/html/rfc7540#section-8.1.2.2
-            &CONNECTION | &TRANSFER_ENCODING | &UPGRADE => continue,
+            // omit HTTP/1.x only headers
-
+            CONNECTION | TRANSFER_ENCODING => continue,
-            &CONTENT_LENGTH if skip_len => continue,
+            CONTENT_LENGTH if skip_len => continue,
-            &DATE => has_date = true,
+            DATE => has_date = true,
-
-            // omit HTTP/1.x only headers according to:
-            // https://datatracker.ietf.org/doc/html/rfc7540#section-8.1.2.2
-            hdr if hdr == HeaderName::from_static("keep-alive")
-                || hdr == HeaderName::from_static("proxy-connection") =>
-            {
-                continue
-            }
-
             _ => {}
         }
 

actix-http/src/h2/mod.rs

@@ -23,7 +23,8 @@ use crate::{
 mod dispatcher;
 mod service;
 
-pub use self::{dispatcher::Dispatcher, service::H2Service};
+pub use self::dispatcher::Dispatcher;
+pub use self::service::H2Service;
 
 /// HTTP/2 peer stream.
 pub struct Payload {
@@ -57,7 +58,10 @@ impl Stream for Payload {
     }
 }
 
-pub(crate) fn handshake_with_timeout<T>(io: T, config: &ServiceConfig) -> HandshakeWithTimeout<T>
+pub(crate) fn handshake_with_timeout<T>(
+    io: T,
+    config: &ServiceConfig,
+) -> HandshakeWithTimeout<T>
 where
     T: AsyncRead + AsyncWrite + Unpin,
 {
@@ -99,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/h2/service.rs

@@ -14,9 +14,8 @@ use actix_service::{
 };
 use actix_utils::future::ready;
 use futures_core::{future::LocalBoxFuture, ready};
-use tracing::{error, trace};
+use log::error;
 
-use super::{dispatcher::Dispatcher, handshake_with_timeout, HandshakeWithTimeout};
 use crate::{
     body::{BoxBody, MessageBody},
     config::ServiceConfig,
@@ -25,6 +24,8 @@ use crate::{
     ConnectCallback, OnConnectData, Request, Response,
 };
 
+use super::{dispatcher::Dispatcher, handshake_with_timeout, HandshakeWithTimeout};
+
 /// `ServiceFactory` implementation for HTTP/2 transport
 pub struct H2Service<T, S, B> {
     srv: S,
@@ -140,8 +141,8 @@ mod openssl {
     }
 }
 
-#[cfg(feature = "rustls-0_20")]
+#[cfg(feature = "rustls")]
-mod rustls_0_20 {
+mod rustls {
     use std::io;
 
     use actix_service::ServiceFactoryExt as _;
@@ -162,7 +163,7 @@ mod rustls_0_20 {
 
         B: MessageBody + 'static,
     {
-        /// Create Rustls v0.20 based service.
+        /// Create Rustls based service.
         pub fn rustls(
             self,
             mut config: ServerConfig,
@@ -191,159 +192,6 @@ mod rustls_0_20 {
     }
 }
 
-#[cfg(feature = "rustls-0_21")]
-mod rustls_0_21 {
-    use std::io;
-
-    use actix_service::ServiceFactoryExt as _;
-    use actix_tls::accept::{
-        rustls_0_21::{reexports::ServerConfig, Acceptor, TlsStream},
-        TlsError,
-    };
-
-    use super::*;
-
-    impl<S, B> H2Service<TlsStream<TcpStream>, S, B>
-    where
-        S: ServiceFactory<Request, Config = ()>,
-        S::Future: 'static,
-        S::Error: Into<Response<BoxBody>> + 'static,
-        S::Response: Into<Response<B>> + 'static,
-        <S::Service as Service<Request>>::Future: 'static,
-
-        B: MessageBody + 'static,
-    {
-        /// Create Rustls v0.21 based service.
-        pub fn rustls_021(
-            self,
-            mut config: ServerConfig,
-        ) -> impl ServiceFactory<
-            TcpStream,
-            Config = (),
-            Response = (),
-            Error = TlsError<io::Error, DispatchError>,
-            InitError = S::InitError,
-        > {
-            let mut protos = vec![b"h2".to_vec()];
-            protos.extend_from_slice(&config.alpn_protocols);
-            config.alpn_protocols = protos;
-
-            Acceptor::new(config)
-                .map_init_err(|_| {
-                    unreachable!("TLS acceptor service factory does not error on init")
-                })
-                .map_err(TlsError::into_service_error)
-                .map(|io: TlsStream<TcpStream>| {
-                    let peer_addr = io.get_ref().0.peer_addr().ok();
-                    (io, peer_addr)
-                })
-                .and_then(self.map_err(TlsError::Service))
-        }
-    }
-}
-
-#[cfg(feature = "rustls-0_22")]
-mod rustls_0_22 {
-    use std::io;
-
-    use actix_service::ServiceFactoryExt as _;
-    use actix_tls::accept::{
-        rustls_0_22::{reexports::ServerConfig, Acceptor, TlsStream},
-        TlsError,
-    };
-
-    use super::*;
-
-    impl<S, B> H2Service<TlsStream<TcpStream>, S, B>
-    where
-        S: ServiceFactory<Request, Config = ()>,
-        S::Future: 'static,
-        S::Error: Into<Response<BoxBody>> + 'static,
-        S::Response: Into<Response<B>> + 'static,
-        <S::Service as Service<Request>>::Future: 'static,
-
-        B: MessageBody + 'static,
-    {
-        /// Create Rustls v0.22 based service.
-        pub fn rustls_0_22(
-            self,
-            mut config: ServerConfig,
-        ) -> impl ServiceFactory<
-            TcpStream,
-            Config = (),
-            Response = (),
-            Error = TlsError<io::Error, DispatchError>,
-            InitError = S::InitError,
-        > {
-            let mut protos = vec![b"h2".to_vec()];
-            protos.extend_from_slice(&config.alpn_protocols);
-            config.alpn_protocols = protos;
-
-            Acceptor::new(config)
-                .map_init_err(|_| {
-                    unreachable!("TLS acceptor service factory does not error on init")
-                })
-                .map_err(TlsError::into_service_error)
-                .map(|io: TlsStream<TcpStream>| {
-                    let peer_addr = io.get_ref().0.peer_addr().ok();
-                    (io, peer_addr)
-                })
-                .and_then(self.map_err(TlsError::Service))
-        }
-    }
-}
-
-#[cfg(feature = "rustls-0_23")]
-mod rustls_0_23 {
-    use std::io;
-
-    use actix_service::ServiceFactoryExt as _;
-    use actix_tls::accept::{
-        rustls_0_23::{reexports::ServerConfig, Acceptor, TlsStream},
-        TlsError,
-    };
-
-    use super::*;
-
-    impl<S, B> H2Service<TlsStream<TcpStream>, S, B>
-    where
-        S: ServiceFactory<Request, Config = ()>,
-        S::Future: 'static,
-        S::Error: Into<Response<BoxBody>> + 'static,
-        S::Response: Into<Response<B>> + 'static,
-        <S::Service as Service<Request>>::Future: 'static,
-
-        B: MessageBody + 'static,
-    {
-        /// Create Rustls v0.23 based service.
-        pub fn rustls_0_23(
-            self,
-            mut config: ServerConfig,
-        ) -> impl ServiceFactory<
-            TcpStream,
-            Config = (),
-            Response = (),
-            Error = TlsError<io::Error, DispatchError>,
-            InitError = S::InitError,
-        > {
-            let mut protos = vec![b"h2".to_vec()];
-            protos.extend_from_slice(&config.alpn_protocols);
-            config.alpn_protocols = protos;
-
-            Acceptor::new(config)
-                .map_init_err(|_| {
-                    unreachable!("TLS acceptor service factory does not error on init")
-                })
-                .map_err(TlsError::into_service_error)
-                .map(|io: TlsStream<TcpStream>| {
-                    let peer_addr = io.get_ref().0.peer_addr().ok();
-                    (io, peer_addr)
-                })
-                .and_then(self.map_err(TlsError::Service))
-        }
-    }
-}
-
 impl<T, S, B> ServiceFactory<(T, Option<net::SocketAddr>)> for H2Service<T, S, B>
 where
     T: AsyncRead + AsyncWrite + Unpin + 'static,
@@ -434,7 +282,7 @@ where
 
         H2ServiceHandlerResponse {
             state: State::Handshake(
-                Some(Rc::clone(&self.flow)),
+                Some(self.flow.clone()),
                 Some(self.cfg.clone()),
                 addr,
                 on_connect_data,
@@ -507,7 +355,7 @@ where
                 }
 
                 Err(err) => {
-                    trace!("H2 handshake error: {}", err);
+                    log::trace!("H2 handshake error: {}", err);
                     Poll::Ready(Err(err))
                 }
             },

actix-http/src/header/common.rs

@@ -1,61 +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 field that sends a signal to the user agent that it ought to remove all data of
-/// a certain set of types.
-///
-/// See the [W3C Clear-Site-Data spec] for full semantics.
-///
-/// [W3C Clear-Site-Data spec]: https://www.w3.org/TR/clear-site-data/#header
-pub const CLEAR_SITE_DATA: HeaderName = HeaderName::from_static("clear-site-data");
-
-/// 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/into_pair.rs

@@ -1,5 +1,7 @@
 //! [`TryIntoHeaderPair`] trait and implementations.
 
+use std::convert::TryFrom as _;
+
 use super::{
     Header, HeaderName, HeaderValue, InvalidHeaderName, InvalidHeaderValue, TryIntoHeaderValue,
 };

actix-http/src/header/into_value.rs

@@ -1,5 +1,7 @@
 //! [`TryIntoHeaderValue`] trait and implementations.
 
+use std::convert::TryFrom as _;
+
 use bytes::Bytes;
 use http::{header::InvalidHeaderValue, Error as HttpError, HeaderValue};
 use mime::Mime;

actix-http/src/header/map.rs

@@ -2,7 +2,7 @@
 
 use std::{borrow::Cow, collections::hash_map, iter, ops};
 
-use foldhash::{HashMap as FoldHashMap, HashMapExt as _};
+use ahash::AHashMap;
 use http::header::{HeaderName, HeaderValue};
 use smallvec::{smallvec, SmallVec};
 
@@ -13,9 +13,8 @@ use super::AsHeaderName;
 /// `HeaderMap` is a "multi-map" of [`HeaderName`] to one or more [`HeaderValue`]s.
 ///
 /// # Examples
-///
 /// ```
-/// # use actix_http::header::{self, HeaderMap, HeaderValue};
+/// use actix_http::header::{self, HeaderMap, HeaderValue};
 ///
 /// let mut map = HeaderMap::new();
 ///
@@ -30,24 +29,9 @@ use super::AsHeaderName;
 ///
 /// assert!(!map.contains_key(header::ORIGIN));
 /// ```
-///
-/// Construct a header map using the [`FromIterator`] implementation. Note that it uses the append
-/// strategy, so duplicate header names are preserved.
-///
-/// ```
-/// use actix_http::header::{self, HeaderMap, HeaderValue};
-///
-/// let headers = HeaderMap::from_iter([
-///     (header::CONTENT_TYPE, HeaderValue::from_static("text/plain")),
-///     (header::COOKIE, HeaderValue::from_static("foo=1")),
-///     (header::COOKIE, HeaderValue::from_static("bar=1")),
-/// ]);
-///
-/// assert_eq!(headers.len(), 3);
-/// ```
 #[derive(Debug, Clone, Default)]
 pub struct HeaderMap {
-    pub(crate) inner: FoldHashMap<HeaderName, Value>,
+    pub(crate) inner: AHashMap<HeaderName, Value>,
 }
 
 /// A bespoke non-empty list for HeaderMap values.
@@ -116,7 +100,7 @@ impl HeaderMap {
     /// ```
     pub fn with_capacity(capacity: usize) -> Self {
         HeaderMap {
-            inner: FoldHashMap::with_capacity(capacity),
+            inner: AHashMap::with_capacity(capacity),
         }
     }
 
@@ -166,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.
@@ -323,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(),
         }
     }
 
@@ -384,8 +370,8 @@ impl HeaderMap {
     /// let removed = map.insert(header::ACCEPT, HeaderValue::from_static("text/html"));
     /// assert!(!removed.is_empty());
     /// ```
-    pub fn insert(&mut self, name: HeaderName, val: HeaderValue) -> Removed {
+    pub fn insert(&mut self, key: HeaderName, val: HeaderValue) -> Removed {
-        let value = self.inner.insert(name, Value::one(val));
+        let value = self.inner.insert(key, Value::one(val));
         Removed::new(value)
     }
 
@@ -566,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
@@ -652,34 +605,10 @@ impl<'a> IntoIterator for &'a HeaderMap {
     }
 }
 
-impl FromIterator<(HeaderName, HeaderValue)> for HeaderMap {
+/// Convert `http::HeaderMap` to our `HeaderMap`.
-    fn from_iter<T: IntoIterator<Item = (HeaderName, HeaderValue)>>(iter: T) -> Self {
-        iter.into_iter()
-            .fold(Self::new(), |mut map, (name, value)| {
-                map.append(name, value);
-                map
-            })
-    }
-}
-
-/// Convert a `http::HeaderMap` to our `HeaderMap`.
 impl From<http::HeaderMap> for HeaderMap {
-    fn from(mut map: http::HeaderMap) -> Self {
+    fn from(mut map: http::HeaderMap) -> HeaderMap {
-        Self::from_drain(map.drain())
+        HeaderMap::from_drain(map.drain())
-    }
-}
-
-/// Convert our `HeaderMap` to a `http::HeaderMap`.
-impl From<HeaderMap> for http::HeaderMap {
-    fn from(map: HeaderMap) -> Self {
-        Self::from_iter(map)
-    }
-}
-
-/// Convert our `&HeaderMap` to a `http::HeaderMap`.
-impl From<&HeaderMap> for http::HeaderMap {
-    fn from(map: &HeaderMap) -> Self {
-        map.to_owned().into()
     }
 }
 
@@ -830,7 +759,7 @@ impl<'a> Drain<'a> {
     }
 }
 
-impl Iterator for Drain<'_> {
+impl<'a> Iterator for Drain<'a> {
     type Item = (Option<HeaderName>, HeaderValue);
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -1014,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();
@@ -1160,7 +1040,9 @@ mod tests {
         assert!(vals.next().is_none());
     }
 
-    fn owned_pair<'a>((name, val): (&'a HeaderName, &'a HeaderValue)) -> (HeaderName, HeaderValue) {
+    fn owned_pair<'a>(
+        (name, val): (&'a HeaderName, &'a HeaderValue),
+    ) -> (HeaderName, HeaderValue) {
         (name.clone(), val.clone())
     }
 }

actix-http/src/header/mod.rs

@@ -1,59 +1,51 @@
 //! Pre-defined `HeaderName`s, traits for parsing and conversion, and other header utility methods.
 
-// declaring new header consts will yield this error
+use percent_encoding::{AsciiSet, CONTROLS};
-#![allow(clippy::declare_interior_mutable_const)]
 
 // 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
+// re-export const header names
-pub use ::http::header::{
+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_CREDENTIALS, ACCESS_CONTROL_ALLOW_HEADERS,
-    ACCESS_CONTROL_ALLOW_ORIGIN, ACCESS_CONTROL_EXPOSE_HEADERS, ACCESS_CONTROL_MAX_AGE,
+    ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN, ACCESS_CONTROL_EXPOSE_HEADERS,
-    ACCESS_CONTROL_REQUEST_HEADERS, ACCESS_CONTROL_REQUEST_METHOD, AGE, ALLOW, ALT_SVC,
+    ACCESS_CONTROL_MAX_AGE, ACCESS_CONTROL_REQUEST_HEADERS, ACCESS_CONTROL_REQUEST_METHOD, AGE,
-    AUTHORIZATION, CACHE_CONTROL, CONNECTION, CONTENT_DISPOSITION, CONTENT_ENCODING,
+    ALLOW, ALT_SVC, AUTHORIZATION, CACHE_CONTROL, CONNECTION, CONTENT_DISPOSITION,
-    CONTENT_LANGUAGE, CONTENT_LENGTH, CONTENT_LOCATION, CONTENT_RANGE, CONTENT_SECURITY_POLICY,
+    CONTENT_ENCODING, CONTENT_LANGUAGE, CONTENT_LENGTH, CONTENT_LOCATION, CONTENT_RANGE,
-    CONTENT_SECURITY_POLICY_REPORT_ONLY, CONTENT_TYPE, COOKIE, DATE, DNT, ETAG, EXPECT, EXPIRES,
+    CONTENT_SECURITY_POLICY, CONTENT_SECURITY_POLICY_REPORT_ONLY, CONTENT_TYPE, COOKIE, DATE,
-    FORWARDED, FROM, HOST, IF_MATCH, IF_MODIFIED_SINCE, IF_NONE_MATCH, IF_RANGE,
+    DNT, ETAG, EXPECT, EXPIRES, FORWARDED, FROM, HOST, IF_MATCH, IF_MODIFIED_SINCE,
-    IF_UNMODIFIED_SINCE, LAST_MODIFIED, LINK, LOCATION, MAX_FORWARDS, ORIGIN, PRAGMA,
+    IF_NONE_MATCH, IF_RANGE, IF_UNMODIFIED_SINCE, LAST_MODIFIED, LINK, LOCATION, MAX_FORWARDS,
-    PROXY_AUTHENTICATE, PROXY_AUTHORIZATION, PUBLIC_KEY_PINS, PUBLIC_KEY_PINS_REPORT_ONLY, RANGE,
+    ORIGIN, PRAGMA, PROXY_AUTHENTICATE, PROXY_AUTHORIZATION, PUBLIC_KEY_PINS,
-    REFERER, REFERRER_POLICY, REFRESH, RETRY_AFTER, SEC_WEBSOCKET_ACCEPT, SEC_WEBSOCKET_EXTENSIONS,
+    PUBLIC_KEY_PINS_REPORT_ONLY, RANGE, REFERER, REFERRER_POLICY, REFRESH, RETRY_AFTER,
-    SEC_WEBSOCKET_KEY, SEC_WEBSOCKET_PROTOCOL, SEC_WEBSOCKET_VERSION, SERVER, SET_COOKIE,
+    SEC_WEBSOCKET_ACCEPT, SEC_WEBSOCKET_EXTENSIONS, SEC_WEBSOCKET_KEY, SEC_WEBSOCKET_PROTOCOL,
-    STRICT_TRANSPORT_SECURITY, TE, TRAILER, TRANSFER_ENCODING, UPGRADE, UPGRADE_INSECURE_REQUESTS,
+    SEC_WEBSOCKET_VERSION, SERVER, SET_COOKIE, STRICT_TRANSPORT_SECURITY, TE, TRAILER,
-    USER_AGENT, VARY, VIA, WARNING, WWW_AUTHENTICATE, X_CONTENT_TYPE_OPTIONS,
+    TRANSFER_ENCODING, UPGRADE, UPGRADE_INSECURE_REQUESTS, USER_AGENT, VARY, VIA, WARNING,
-    X_DNS_PREFETCH_CONTROL, X_FRAME_OPTIONS, X_XSS_PROTECTION,
+    WWW_AUTHENTICATE, X_CONTENT_TYPE_OPTIONS, X_DNS_PREFETCH_CONTROL, X_FRAME_OPTIONS,
+    X_XSS_PROTECTION,
 };
-use percent_encoding::{AsciiSet, CONTROLS};
 
 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::{
+pub use self::as_name::AsHeaderName;
-    as_name::AsHeaderName,
+pub use self::into_pair::TryIntoHeaderPair;
-    // re-export list is explicit so that any updates to `http` do not conflict with this set
+pub use self::into_value::TryIntoHeaderValue;
-    common::{
+pub use self::map::HeaderMap;
-        CACHE_STATUS, CDN_CACHE_CONTROL, CLEAR_SITE_DATA, CROSS_ORIGIN_EMBEDDER_POLICY,
+pub use self::shared::{
-        CROSS_ORIGIN_OPENER_POLICY, CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY,
+    parse_extended_value, q, Charset, ContentEncoding, ExtendedValue, HttpDate, LanguageTag,
-        X_FORWARDED_FOR, X_FORWARDED_HOST, X_FORWARDED_PROTO,
+    Quality, QualityItem,
-    },
+};
-    into_pair::TryIntoHeaderPair,
+pub use self::utils::{
-    into_value::TryIntoHeaderValue,
+    fmt_comma_delimited, from_comma_delimited, from_one_raw_str, http_percent_encode,
-    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},
 };
 
 /// An interface for types that already represent a valid header.

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

@@ -1,4 +1,4 @@
-use std::str::FromStr;
+use std::{convert::TryFrom, str::FromStr};
 
 use derive_more::{Display, Error};
 use http::header::InvalidHeaderValue;
@@ -11,7 +11,7 @@ use crate::{
 
 /// Error returned when a content encoding is unknown.
 #[derive(Debug, Display, Error)]
-#[display("unsupported content encoding")]
+#[display(fmt = "unsupported content encoding")]
 pub struct ContentEncodingParseError;
 
 /// Represents a supported content encoding.

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

@@ -24,7 +24,8 @@ impl FromStr for HttpDate {
 
 impl fmt::Display for HttpDate {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        httpdate::HttpDate::from(self.0).fmt(f)
+        let date_str = httpdate::fmt_http_date(self.0);
+        f.write_str(&date_str)
     }
 }
 
@@ -36,7 +37,7 @@ impl TryIntoHeaderValue for HttpDate {
         let mut wrt = MutWriter(&mut buf);
 
         // unwrap: date output is known to be well formed and of known length
-        write!(wrt, "{}", self).unwrap();
+        write!(wrt, "{}", httpdate::fmt_http_date(self.0)).unwrap();
 
         HeaderValue::from_maybe_shared(buf.split().freeze())
     }

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

@@ -1,7 +1,5 @@
 //! Originally taken from `hyper::header::shared`.
 
-pub use language_tags::LanguageTag;
-
 mod charset;
 mod content_encoding;
 mod extended;
@@ -9,11 +7,10 @@ mod http_date;
 mod quality;
 mod quality_item;
 
-pub use self::{
+pub use self::charset::Charset;
-    charset::Charset,
+pub use self::content_encoding::ContentEncoding;
-    content_encoding::ContentEncoding,
+pub use self::extended::{parse_extended_value, ExtendedValue};
-    extended::{parse_extended_value, ExtendedValue},
+pub use self::http_date::HttpDate;
-    http_date::HttpDate,
+pub use self::quality::{q, Quality};
-    quality::{q, Quality},
+pub use self::quality_item::QualityItem;
-    quality_item::QualityItem,
+pub use language_tags::LanguageTag;
-};

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

@@ -1,4 +1,7 @@
-use std::fmt;
+use std::{
+    convert::{TryFrom, TryInto},
+    fmt,
+};
 
 use derive_more::{Display, Error};
 
@@ -125,7 +128,7 @@ pub fn itoa_fmt<W: fmt::Write, V: itoa::Integer>(mut wr: W, value: V) -> fmt::Re
 }
 
 #[derive(Debug, Clone, Display, Error)]
-#[display("quality out of bounds")]
+#[display(fmt = "quality out of bounds")]
 #[non_exhaustive]
 pub struct QualityOutOfBounds;
 

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

@@ -1,7 +1,8 @@
-use std::{cmp, fmt, str};
+use std::{cmp, convert::TryFrom as _, fmt, str};
+
+use crate::error::ParseError;
 
 use super::Quality;
-use crate::error::ParseError;
 
 /// Represents an item with a quality value as defined
 /// in [RFC 7231 §5.3.1](https://datatracker.ietf.org/doc/html/rfc7231#section-5.3.1).
@@ -146,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/header/utils.rs

@@ -80,18 +80,18 @@ mod tests {
 
     #[test]
     fn comma_delimited_parsing() {
-        let headers = [];
+        let headers = vec![];
         let res: Vec<usize> = from_comma_delimited(headers.iter()).unwrap();
         assert_eq!(res, vec![0; 0]);
 
-        let headers = [
+        let headers = vec![
             HeaderValue::from_static("1, 2"),
             HeaderValue::from_static("3,4"),
         ];
         let res: Vec<usize> = from_comma_delimited(headers.iter()).unwrap();
         assert_eq!(res, vec![1, 2, 3, 4]);
 
-        let headers = [
+        let headers = vec![
             HeaderValue::from_static(""),
             HeaderValue::from_static(","),
             HeaderValue::from_static("  "),