.cargo/config.toml

@@ -0,0 +1,17 @@
+[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,experimental-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"
+
+# compile docs as docs.rs would
+# RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc --no-deps --workspace

.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/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,28 @@ name: Benchmark
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
 
 permissions:
-  contents: read
+  contents: read  #  to fetch code (actions/checkout)
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
 
 jobs:
   check_benchmark:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@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-post-merge.yml

@@ -5,87 +5,132 @@ on:
     branches: [master]
 
 permissions:
-  contents: read
+  contents: read  #  to fetch code (actions/checkout)
-
-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 }
+          - { name: Windows, os: windows-2022, triple: x86_64-pc-windows-msvc }
         version:
-          - { name: nightly, version: nightly }
+          - nightly
 
-    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
+      CARGO_UNSTABLE_SPARSE_REGISTRY: true
+
     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: Install Rust (${{ matrix.version.name }})
+      - name: Install ${{ matrix.version }}
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rs/toolchain@v1
         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: Install cargo-hack
-        uses: taiki-e/install-action@v2.49.39
+        uses: taiki-e/install-action@cargo-hack
-        with:
+
-          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
 
       - name: check minimal
-        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
+          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: CI cache clean
+      - name: Clear the cargo caches
-        run: cargo-ci-cache-clean
+        run: |
+          cargo install cargo-cache --version 0.8.2 --no-default-features --features ci-autoclean
+          cargo-cache
 
   ci_feature_powerset_check:
     name: Verify Feature Combinations
     runs-on: ubuntu-latest
 
+    env:
+      CI: 1
+      CARGO_INCREMENTAL: 0
+
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
-      - name: Free Disk Space
+      - uses: dtolnay/rust-toolchain@stable
-        run: ./scripts/free-disk-space.sh
 
-      - name: Setup mold linker
+      - name: Install cargo-hack
-        uses: rui314/setup-mold@v1
+        uses: taiki-e/install-action@cargo-hack
 
-      - name: Install Rust
+      - name: Generate Cargo.lock
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        run: cargo generate-lockfile
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
 
-      - name: Install just, cargo-hack
+      - name: check feature combinations
-        uses: taiki-e/install-action@v2.49.39
+        run: cargo ci-check-all-feature-powerset
-        with:
-          tool: just,cargo-hack
 
-      - name: Check feature combinations
+      - name: check feature combinations
-        run: just check-feature-combinations
+        run: cargo ci-check-all-feature-powerset-linux
+
+  nextest:
+    name: nextest
+    runs-on: ubuntu-latest
+
+    env:
+      CI: 1
+      CARGO_INCREMENTAL: 0
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: dtolnay/rust-toolchain@stable
+
+      - name: Install nextest
+        uses: taiki-e/install-action@nextest
+
+      - name: Generate Cargo.lock
+        run: cargo generate-lockfile
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.3.0
+
+      - name: Test with cargo-nextest
+        run: cargo nextest run

.github/workflows/ci.yml

@@ -3,119 +3,135 @@ name: CI
 on:
   pull_request:
     types: [opened, synchronize, reopened]
-  merge_group:
-    types: [checks_requested]
   push:
     branches: [master]
 
 permissions:
-  contents: read
+  contents: read  #  to fetch code (actions/checkout)
-
-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.59.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: Install cargo-hack
-        uses: taiki-e/install-action@v2.49.39
+        uses: taiki-e/install-action@cargo-hack
-        with:
-          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
       - name: workaround MSRV issues
-        if: matrix.version.name == 'msrv'
+        if: matrix.version != 'stable'
-        run: just downgrade-for-msrv
+        run: |
+          cargo install cargo-edit --version=0.8.0
+          cargo add const-str@0.3 --dev -p=actix-web
+          cargo add const-str@0.3 --dev -p=awc
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
+
+      - name: workaround MSRV issues
+        if: matrix.version != 'stable'
+        run: |
+          cargo update -p=zstd-sys --precise=2.0.1+zstd.1.5.2
 
       - 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
+          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: CI cache clean
+      - name: Clear the cargo caches
-        run: cargo-ci-cache-clean
+        run: |
+          cargo install cargo-cache --version 0.8.2 --no-default-features --features ci-autoclean
+          cargo-cache
 
   io-uring:
     name: io-uring tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
-      - name: Install Rust
+      - uses: dtolnay/rust-toolchain@stable
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+
-        with:
+      - name: Generate Cargo.lock
-          toolchain: nightly
+        run: cargo generate-lockfile
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.3.0
 
       - name: tests (io-uring)
         timeout-minutes: 60
         run: >
-          sudo bash -c "ulimit -Sl 512 && ulimit -Hl 512 && PATH=$PATH:/usr/share/rust/.cargo/bin && RUSTUP_TOOLCHAIN=stable cargo test --lib --tests -p=actix-files --all-features"
+          sudo bash -c "ulimit -Sl 512
+          && ulimit -Hl 512
+          && PATH=$PATH:/usr/share/rust/.cargo/bin
+          && RUSTUP_TOOLCHAIN=stable cargo test --lib --tests -p=actix-files --all-features"
 
   rustdoc:
     name: doc tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
-      - name: Install Rust (nightly)
+      - uses: dtolnay/rust-toolchain@nightly
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
-        with:
-          toolchain: nightly
 
-      - name: Install just
+      - name: Generate Cargo.lock
-        uses: taiki-e/install-action@v2.49.39
+        run: cargo generate-lockfile
-        with:
+      - name: Cache Dependencies
-          tool: just
+        uses: Swatinem/rust-cache@v1.3.0
 
       - name: doc tests
-        run: just test-docs
+        run: cargo ci-doctest
+        timeout-minutes: 60

.github/workflows/clippy-fmt.yml

@@ -0,0 +1,49 @@
+name: Lint
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@nightly
+        with: { components: rustfmt }
+      - run: cargo fmt --all -- --check
+
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: dtolnay/rust-toolchain@stable
+        with: { components: clippy }
+
+      - name: Generate Cargo.lock
+        run: cargo generate-lockfile
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
+  
+      - name: Check with Clippy
+        uses: actions-rs/clippy-check@v1
+        with:
+          args: --workspace --tests --examples --all-features
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  lint-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: dtolnay/rust-toolchain@stable
+        with: { 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 +1,36 @@
+# disabled because `cargo tarpaulin` currently segfaults
+
 name: Coverage
 
 on:
   push:
     branches: [master]
 
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
+  # job currently (1st Feb 2022) segfaults
   coverage:
+    name: coverage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
-      - name: Install Rust (nightly)
+      - name: Install stable
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: stable-x86_64-unknown-linux-gnu
-          components: llvm-tools
+          profile: minimal
+          override: true
 
-      - name: Install just, cargo-llvm-cov, cargo-nextest
+      - name: Generate Cargo.lock
-        uses: taiki-e/install-action@v2.49.39
+        uses: actions-rs/cargo@v1
-        with:
+        with: { command: generate-lockfile }
-          tool: just,cargo-llvm-cov,cargo-nextest
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
 
-      - name: Generate code coverage
+      - name: Generate coverage file
-        run: just test-coverage-codecov
+        run: |
-
+          cargo install cargo-tarpaulin --vers "^0.13"
-      - name: Upload coverage to Codecov
+          cargo tarpaulin --workspace --features=rustls,openssl --out Xml --verbose
-        uses: codecov/codecov-action@v5.4.0
+      - name: Upload to Codecov
-        with:
+        uses: codecov/codecov-action@v1
-          files: codecov.json
+        with: { file: cobertura.xml }
-          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.39
-        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,32 @@
+name: Upload Documentation
+
+on:
+  push:
+    branches: [master]
+
+permissions: {}
+jobs:
+  build:
+    permissions:
+      contents: write  #  to push changes in repo (jamesives/github-pages-deploy-action)
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: dtolnay/rust-toolchain@nightly
+
+      - name: Build Docs
+        run: cargo +nightly doc --no-deps --workspace --all-features
+        env:
+          RUSTDOCFLAGS: --cfg=docsrs
+
+      - name: Tweak HTML
+        run: echo '<meta http-equiv="refresh" content="0;url=actix_web/index.html">' > target/doc/index.html
+
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        with:
+          folder: target/doc
+          single-commit: true

.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.yaml

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

.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

@@ -14,13 +14,6 @@ members = [
     "awc",
 ]
 
-[workspace.package]
-homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-web"
-license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.75"
-
 [profile.dev]
 # Disabling debug info speeds up builds a bunch and we don't rely on it for debugging that much.
 debug = 0
@@ -51,11 +44,3 @@ awc = { path = "awc" }
 # actix-utils = { path = "../actix-net/actix-utils" }
 # actix-tls = { path = "../actix-net/actix-tls" }
 # actix-server = { path = "../actix-net/actix-server" }
-
-[workspace.lints.rust]
-rust_2018_idioms = { level = "deny" }
-future_incompatible = { level = "deny" }
-nonstandard_style = { level = "deny" }
-
-[workspace.lints.clippy]
-# clone_on_ref_ptr = { level = "deny" }

actix-files/CHANGES.md

@@ -1,24 +1,8 @@
 # Changes
 
-## Unreleased
+## Unreleased - 2023-xx-xx
 
-- Minimum supported Rust version (MSRV) is now 1.75.
+## 0.6.3 - 2023-01-21
-
-## 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.
@@ -26,14 +10,14 @@
 
 [#2903]: https://github.com/actix/actix-web/pull/2903
 
-## 0.6.2
+## 0.6.2 - 2022-07-23
 
 - 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
+## 0.6.1 - 2022-06-11
 
 - Add `NamedFile::{modified, metadata, content_type, content_disposition, encoding}()` getters. [#2021]
 - Update `tokio-uring` dependency to `0.3`.
@@ -43,25 +27,25 @@
 [#2021]: https://github.com/actix/actix-web/pull/2021
 [#2645]: https://github.com/actix/actix-web/pull/2645
 
-## 0.6.0
+## 0.6.0 - 2022-02-25
 
 - 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]
@@ -69,19 +53,19 @@
 
 [#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]
@@ -93,15 +77,15 @@
 [#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]
@@ -109,7 +93,7 @@
 [#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]
@@ -121,17 +105,17 @@
 [#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]
@@ -139,39 +123,39 @@
 [#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
@@ -180,73 +164,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
+## 0.1.7 - 2019-11-06
 
 - Add an additional `filename*` param in the `Content-Disposition` header of `actix_files::NamedFile` to be more compatible. (#1151)
 
-## 0.1.6
+## 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,6 +1,6 @@
 [package]
 name = "actix-files"
-version = "0.6.6"
+version = "0.6.3"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Rob Ede <robjtede@icloud.com>",
@@ -11,16 +11,11 @@ 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"]
@@ -31,29 +26,25 @@ actix-service = "2"
 actix-utils = "3"
 actix-web = { version = "4", default-features = false }
 
-bitflags = "2"
+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"] }
 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"
+v_htmlescape= "0.15"
 
 # experimental-io-uring
 [target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.5", optional = true, features = ["bytes"] }
+tokio-uring = { version = "0.4", optional = true, features = ["bytes"] }
-actix-server = { version = "2.4", optional = true } # ensure matching tokio-uring versions
+actix-server = { version = "2.2", optional = true } # ensure matching tokio-uring versions
 
 [dev-dependencies]
 actix-rt = "2.7"
 actix-test = "0.1"
 actix-web = "4"
-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.3)](https://docs.rs/actix-files/0.6.3)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![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.3/status.svg)](https://deps.rs/crate/actix-files/0.6.3)
 [![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-files)
-Static file serving for Actix Web.
+- Minimum Supported Rust Version (MSRV): 1.59
-
-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! {

actix-files/src/directory.rs

@@ -1,9 +1,4 @@
-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 percent_encoding::{utf8_percent_encode, CONTROLS};

actix-files/src/error.rs

@@ -4,45 +4,46 @@ use derive_more::Display;
 /// Errors which can occur when serving static files.
 #[derive(Debug, PartialEq, Eq, Display)]
 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
     }
 }
 
+#[allow(clippy::enum_variant_names)]
 #[derive(Debug, PartialEq, Eq, Display)]
 #[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,
@@ -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(
@@ -417,14 +422,10 @@ mod tests {
 
         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.ends_with(b"actix-files/tests/"),
-            "body {:?} does not end with {:?}",
+            "body {:?} does not end with `actix-files/tests/`",
-            actual_path,
+            body
-            expected_path
         );
     }
 }

actix-files/src/lib.rs

@@ -11,12 +11,9 @@
 //!     .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")]
+#![allow(clippy::uninlined_format_args)]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
-
-use std::path::Path;
 
 use actix_service::boxed::{BoxService, BoxServiceFactory};
 use actix_web::{
@@ -25,6 +22,7 @@ use actix_web::{
     http::header::DispositionType,
 };
 use mime_guess::from_ext;
+use std::path::Path;
 
 mod chunked;
 mod directory;
@@ -36,15 +34,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 +63,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 +72,7 @@ mod tests {
         dev::ServiceFactory,
         guard,
         http::{
-            header::{self, ContentDisposition, DispositionParam},
+            header::{self, ContentDisposition, DispositionParam, DispositionType},
             Method, StatusCode,
         },
         middleware::Compress,
@@ -306,11 +304,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\""
         );
     }
 
@@ -553,9 +551,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 +566,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 +664,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 +678,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 +840,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,
     },
@@ -24,11 +24,11 @@ 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;
@@ -84,7 +84,6 @@ pub struct NamedFile {
 
 #[cfg(not(feature = "experimental-io-uring"))]
 pub(crate) use std::fs::File;
-
 #[cfg(feature = "experimental-io-uring")]
 pub(crate) use tokio_uring::fs::File;
 
@@ -127,7 +126,7 @@ 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,
@@ -139,13 +138,8 @@ impl NamedFile {
                 _ => 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 {

actix-files/src/path_buf.rs

@@ -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

@@ -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

@@ -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;

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,18 +1,12 @@
 # Changes
 
-## Unreleased
+## Unreleased - 2023-xx-xx
 
-- Minimum supported Rust version (MSRV) is now 1.72.
+## 3.1.0 - 2023-01-21
-
-## 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
+## 3.0.0 - 2022-07-24
 
 - `TestServer::stop` is now async and will wait for the server and system to shutdown. [#2442]
 - Added `TestServer::client_headers` method. [#2097]
@@ -28,41 +22,41 @@
 <details>
 <summary>3.0.0 Pre-Releases</summary>
 
-## 3.0.0-beta.13
+## 3.0.0-beta.13 - 2022-02-16
 
 - 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]
@@ -70,25 +64,25 @@
 
 [#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]
 
@@ -96,7 +90,7 @@
 
 </details>
 
-## 2.1.0
+## 2.1.0 - 2020-11-25
 
 - Add ability to set address for `TestServer`. [#1645]
 - Upgrade `base64` to `0.13`.
@@ -105,11 +99,11 @@
 [#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
@@ -119,57 +113,57 @@
 - 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.1.0"
 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 = []
@@ -47,18 +39,16 @@ awc = { version = "3", default-features = false }
 
 bytes = "1"
 futures-core = { version = "0.3.17", 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"] }
 
 [dev-dependencies]
+actix-web = { version = "4", default-features = false, features = ["cookies"] }
 actix-http = "3"
-
-[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.1.0)](https://docs.rs/actix-http-test/3.1.0)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http-test)
 <br>
-[![Dependency Status](https://deps.rs/crate/actix-http-test/3.2.0/status.svg)](https://deps.rs/crate/actix-http-test/3.2.0)
+[![Dependency Status](https://deps.rs/crate/actix-http-test/3.1.0/status.svg)](https://deps.rs/crate/actix-http-test/3.1.0)
 [![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.59
-Various helpers for Actix applications to use during testing.
-
-<!-- cargo-rdme end -->

actix-http-test/src/lib.rs

@@ -1,8 +1,10 @@
 //! Various helpers for Actix applications to use during testing.
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
+#![allow(clippy::uninlined_format_args)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 
 #[cfg(feature = "openssl")]
 extern crate tls_openssl as openssl;
@@ -28,31 +30,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();
@@ -106,7 +104,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))

actix-http/CHANGES.md

@@ -1,93 +1,8 @@
 # Changes
 
-## Unreleased
+## Unreleased - 2023-xx-xx
 
-## 3.10.0
+## 3.3.0 - 2023-01-21
-
-### Added
-
-- Add `header::CLEAR_SITE_DATA` constant.
-- Add `Extensions::get_or_insert[_with]()` methods.
-- Implement `From<Bytes>` for `Payload`.
-- Implement `From<Vec<u8>>` for `Payload`.
-
-### Changed
-
-- Update `brotli` dependency to `7`.
-- Minimum supported Rust version (MSRV) is now 1.75.
-
-## 3.9.0
-
-### Added
-
-- Implement `FromIterator<(HeaderName, HeaderValue)>` for `HeaderMap`.
-
-## 3.8.0
-
-### Added
-
-- Add `error::InvalidStatusCode` re-export.
-
-## 3.7.0
-
-### Added
-
-- Add `rustls-0_23` crate feature
-- Add `{h1::H1Service, h2::H2Service, HttpService}::rustls_0_23()` and `HttpService::rustls_0_23_with_config()` service constructors.
-
-### Changed
-
-- Update `brotli` dependency to `6`.
-- Minimum supported Rust version (MSRV) is now 1.72.
-
-## 3.6.0
-
-### Added
-
-- Add `rustls-0_22` crate feature.
-- Add `{h1::H1Service, h2::H2Service, HttpService}::rustls_0_22()` and `HttpService::rustls_0_22_with_config()` service constructors.
-- Implement `From<&HeaderMap>` for `http::HeaderMap`.
-
-## 3.5.1
-
-### Fixed
-
-- Prevent hang when returning zero-sized response bodies through compression layer.
-
-## 3.5.0
-
-### Added
-
-- Implement `From<HeaderMap>` for `http::HeaderMap`.
-
-### Changed
-
-- Updated `zstd` dependency to `0.13`.
-
-### Fixed
-
-- Prevent compression of zero-sized response bodies.
-
-## 3.4.0
-
-### Added
-
-- Add `rustls-0_20` crate feature.
-- Add `{h1::H1Service, h2::H2Service, HttpService}::rustls_021()` and `HttpService::rustls_021_with_config()` service constructors.
-- Add `body::to_bytes_limited()` function.
-- Add `body::BodyLimitExceeded` error type.
-
-### Changed
-
-- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
-
-## 3.3.1
-
-### Fixed
-
-- Use correct `http` version requirement to ensure support for const `HeaderName` definitions.
-
-## 3.3.0
 
 ### Added
 
@@ -123,7 +38,7 @@
 [#2956]: https://github.com/actix/actix-web/pull/2956
 [#2968]: https://github.com/actix/actix-web/pull/2968
 
-## 3.2.2
+## 3.2.2 - 2022-09-11
 
 ### Changed
 
@@ -135,7 +50,7 @@
 
 [#2369]: https://github.com/actix/actix-web/pull/2369
 
-## 3.2.1
+## 3.2.1 - 2022-07-02
 
 ### Fixed
 
@@ -143,7 +58,7 @@
 
 [#2794]: https://github.com/actix/actix-web/pull/2794
 
-## 3.2.0
+## 3.2.0 - 2022-06-30
 
 ### Changed
 
@@ -157,7 +72,7 @@
 [#2790]: https://github.com/actix/actix-web/pull/2790
 [#2798]: https://github.com/actix/actix-web/pull/2798
 
-## 3.1.0
+## 3.1.0 - 2022-06-11
 
 ### Changed
 
@@ -171,13 +86,13 @@
 [#2357]: https://github.com/actix/actix-web/issues/2357
 [#2779]: https://github.com/actix/actix-web/pull/2779
 
-## 3.0.4
+## 3.0.4 - 2022-03-09
 
 ### Fixed
 
 - Document on docs.rs with `ws` feature enabled.
 
-## 3.0.3
+## 3.0.3 - 2022-03-08
 
 ### Fixed
 
@@ -185,7 +100,7 @@
 
 [#2684]: https://github.com/actix/actix-web/pull/2684
 
-## 3.0.2
+## 3.0.2 - 2022-03-05
 
 ### Fixed
 
@@ -193,13 +108,13 @@
 
 [#2683]: https://github.com/actix/actix-web/pull/2683
 
-## 3.0.1
+## 3.0.1 - 2022-03-04
 
 - Fix panic in H1 dispatcher when pipelining is used with keep-alive. [#2678]
 
 [#2678]: https://github.com/actix/actix-web/issues/2678
 
-## 3.0.0
+## 3.0.0 - 2022-02-25
 
 ### Dependencies
 
@@ -487,7 +402,7 @@
 <details>
 <summary>3.0.0 Pre-Releases</summary>
 
-## 3.0.0-rc.4
+## 3.0.0-rc.4 - 2022-02-22
 
 ### Fixed
 
@@ -495,11 +410,11 @@
 
 [1ce58ecb]: https://github.com/actix/actix-web/commit/1ce58ecb305c60e51db06e6c913b7a1344e229ca
 
-## 3.0.0-rc.3
+## 3.0.0-rc.3 - 2022-02-16
 
 - No significant changes since `3.0.0-rc.2`.
 
-## 3.0.0-rc.2
+## 3.0.0-rc.2 - 2022-02-08
 
 ### Added
 
@@ -516,7 +431,7 @@
 [#2624]: https://github.com/actix/actix-web/pull/2624
 [#2625]: https://github.com/actix/actix-web/pull/2625
 
-## 3.0.0-rc.1
+## 3.0.0-rc.1 - 2022-01-31
 
 ### Added
 
@@ -552,7 +467,7 @@
 [#2611]: https://github.com/actix/actix-web/pull/2611
 [#2618]: https://github.com/actix/actix-web/pull/2618
 
-## 3.0.0-beta.19
+## 3.0.0-beta.19 - 2022-01-21
 
 ### Added
 
@@ -572,7 +487,7 @@
 [#2585]: https://github.com/actix/actix-web/pull/2585
 [#2587]: https://github.com/actix/actix-web/pull/2587
 
-## 3.0.0-beta.18
+## 3.0.0-beta.18 - 2022-01-04
 
 ### Added
 
@@ -603,7 +518,7 @@
 [#2501]: https://github.com/actix/actix-web/pull/2501
 [#2565]: https://github.com/actix/actix-web/pull/2565
 
-## 3.0.0-beta.17
+## 3.0.0-beta.17 - 2021-12-27
 
 ### Changed
 
@@ -621,7 +536,7 @@
 [#2527]: https://github.com/actix/actix-web/pull/2527
 [#2545]: https://github.com/actix/actix-web/pull/2545
 
-## 3.0.0-beta.16
+## 3.0.0-beta.16 - 2021-12-17
 
 ### Added
 
@@ -640,7 +555,7 @@
 [#2510]: https://github.com/actix/actix-web/pull/2510
 [#2522]: https://github.com/actix/actix-web/pull/2522
 
-## 3.0.0-beta.15
+## 3.0.0-beta.15 - 2021-12-11
 
 ### Added
 
@@ -694,7 +609,7 @@
 [#2497]: https://github.com/actix/actix-web/pull/2497
 [#2520]: https://github.com/actix/actix-web/pull/2520
 
-## 3.0.0-beta.14
+## 3.0.0-beta.14 - 2021-11-30
 
 ### Changed
 
@@ -707,7 +622,7 @@
 [#2470]: https://github.com/actix/actix-web/pull/2470
 [#2474]: https://github.com/actix/actix-web/pull/2474
 
-## 3.0.0-beta.13
+## 3.0.0-beta.13 - 2021-11-22
 
 ### Added
 
@@ -736,7 +651,7 @@
 [#2448]: https://github.com/actix/actix-web/pull/2448
 [#2456]: https://github.com/actix/actix-web/pull/2456
 
-## 3.0.0-beta.12
+## 3.0.0-beta.12 - 2021-11-15
 
 ### Changed
 
@@ -750,7 +665,7 @@
 [#2425]: https://github.com/actix/actix-web/pull/2425
 [#2442]: https://github.com/actix/actix-web/pull/2442
 
-## 3.0.0-beta.11
+## 3.0.0-beta.11 - 2021-10-20
 
 ### Changed
 
@@ -759,7 +674,7 @@
 
 [#2414]: https://github.com/actix/actix-web/pull/2414
 
-## 3.0.0-beta.10
+## 3.0.0-beta.10 - 2021-09-09
 
 ### Changed
 
@@ -777,13 +692,13 @@
 [#2344]: https://github.com/actix/actix-web/pull/2344
 [#2377]: https://github.com/actix/actix-web/pull/2377
 
-## 3.0.0-beta.9
+## 3.0.0-beta.9 - 2021-08-09
 
 ### Fixed
 
 - Potential HTTP request smuggling vulnerabilities. [RUSTSEC-2021-0081](https://github.com/rustsec/advisory-db/pull/977)
 
-## 3.0.0-beta.8
+## 3.0.0-beta.8 - 2021-06-26
 
 ### Changed
 
@@ -796,7 +711,7 @@
 [#2291]: https://github.com/actix/actix-web/pull/2291
 [#2250]: https://github.com/actix/actix-web/pull/2250
 
-## 3.0.0-beta.7
+## 3.0.0-beta.7 - 2021-06-17
 
 ### Added
 
@@ -843,7 +758,7 @@
 [#2253]: https://github.com/actix/actix-web/pull/2253
 [#2244]: https://github.com/actix/actix-web/pull/2244
 
-## 3.0.0-beta.6
+## 3.0.0-beta.6 - 2021-04-17
 
 ### Added
 
@@ -878,7 +793,7 @@
 [#2158]: https://github.com/actix/actix-web/pull/2158
 [#2161]: https://github.com/actix/actix-web/pull/2161
 
-## 3.0.0-beta.5
+## 3.0.0-beta.5 - 2021-04-02
 
 ### Added
 
@@ -900,7 +815,7 @@
 [#2094]: https://github.com/actix/actix-web/pull/2094
 [#2127]: https://github.com/actix/actix-web/pull/2127
 
-## 3.0.0-beta.4
+## 3.0.0-beta.4 - 2021-03-08
 
 ### Changed
 
@@ -918,11 +833,11 @@
 [#2035]: https://github.com/actix/actix-web/pull/2035
 [#2052]: https://github.com/actix/actix-web/pull/2052
 
-## 3.0.0-beta.3
+## 3.0.0-beta.3 - 2021-02-10
 
 - No notable changes.
 
-## 3.0.0-beta.2
+## 3.0.0-beta.2 - 2021-02-10
 
 ### Added
 
@@ -974,7 +889,7 @@
 [#1964]: https://github.com/actix/actix-web/pull/1964
 [#1969]: https://github.com/actix/actix-web/pull/1969
 
-## 3.0.0-beta.1
+## 3.0.0-beta.1 - 2021-01-07
 
 ### Added
 
@@ -1002,7 +917,7 @@
 
 </details>
 
-## 2.2.2
+## 2.2.2 - 2022-01-21
 
 ### Changed
 
@@ -1010,13 +925,13 @@
 
 [ad7e3c06]: https://github.com/actix/actix-web/commit/ad7e3c06
 
-## 2.2.1
+## 2.2.1 - 2021-08-09
 
 ### Fixed
 
 - Potential HTTP request smuggling vulnerabilities. [RUSTSEC-2021-0081](https://github.com/rustsec/advisory-db/pull/977)
 
-## 2.2.0
+## 2.2.0 - 2020-11-25
 
 ### Added
 
@@ -1038,7 +953,7 @@
 [#1793]: https://github.com/actix/actix-web/pull/1793
 [#1797]: https://github.com/actix/actix-web/pull/1797
 
-## 2.1.0
+## 2.1.0 - 2020-10-30
 
 ### Added
 
@@ -1055,18 +970,18 @@
 [#1733]: https://github.com/actix/actix-web/pull/1733
 [#1744]: https://github.com/actix/actix-web/pull/1744
 
-## 2.0.0
+## 2.0.0 - 2020-09-11
 
 - No significant changes from `2.0.0-beta.4`.
 
-## 2.0.0-beta.4
+## 2.0.0-beta.4 - 2020-09-09
 
 ### Changed
 
 - Update actix-codec and actix-utils dependencies.
 - Update actix-connect and actix-tls dependencies.
 
-## 2.0.0-beta.3
+## 2.0.0-beta.3 - 2020-08-14
 
 ### Fixed
 
@@ -1074,7 +989,7 @@
 
 [#1626]: https://github.com/actix/actix-web/pull/1626
 
-## 2.0.0-beta.2
+## 2.0.0-beta.2 - 2020-07-21
 
 ### Fixed
 
@@ -1087,7 +1002,7 @@
 [#1614]: https://github.com/actix/actix-web/pull/1614
 [#1615]: https://github.com/actix/actix-web/pull/1615
 
-## 2.0.0-beta.1
+## 2.0.0-beta.1 - 2020-07-11
 
 ### Changed
 
@@ -1100,7 +1015,7 @@
 [#1586]: https://github.com/actix/actix-web/pull/1586
 [#1580]: https://github.com/actix/actix-web/pull/1580
 
-## 2.0.0-alpha.4
+## 2.0.0-alpha.4 - 2020-05-21
 
 ### Changed
 
@@ -1116,7 +1031,7 @@
 [#1439]: https://github.com/actix/actix-web/pull/1439
 [#1503]: https://github.com/actix/actix-web/pull/1503
 
-## 2.0.0-alpha.3
+## 2.0.0-alpha.3 - 2020-05-08
 
 ### Fixed
 
@@ -1131,7 +1046,7 @@
 [#1422]: https://github.com/actix/actix-web/pull/1422
 [#1487]: https://github.com/actix/actix-web/pull/1487
 
-## 2.0.0-alpha.2
+## 2.0.0-alpha.2 - 2020-03-07
 
 ### Changed
 
@@ -1143,7 +1058,7 @@
 [#1394]: https://github.com/actix/actix-web/pull/1394
 [#1395]: https://github.com/actix/actix-web/pull/1395
 
-## 2.0.0-alpha.1
+## 2.0.0-alpha.1 - 2020-02-27
 
 ### Changed
 
@@ -1156,14 +1071,14 @@
 
 - Allow `SameSite=None` cookies to be sent in a response.
 
-## 1.0.1
+## 1.0.1 - 2019-12-20
 
 ### Fixed
 
 - Poll upgrade service's readiness from HTTP service handlers
 - Replace brotli with brotli2 #1224
 
-## 1.0.0
+## 1.0.0 - 2019-12-13
 
 ### Added
 
@@ -1173,7 +1088,7 @@
 
 - Replace `flate2-xxx` features with `compress`
 
-## 1.0.0-alpha.5
+## 1.0.0-alpha.5 - 2019-12-09
 
 ### Fixed
 
@@ -1184,7 +1099,7 @@
 
 - Websockets: Ping and Pong should have binary data #1049
 
-## 1.0.0-alpha.4
+## 1.0.0-alpha.4 - 2019-12-08
 
 ### Added
 
@@ -1194,14 +1109,14 @@
 
 - Use rust based brotli compression library
 
-## 1.0.0-alpha.3
+## 1.0.0-alpha.3 - 2019-12-07
 
 ### Changed
 
 - Migrate to tokio 0.2
 - Migrate to `std::future`
 
-## 0.2.11
+## 0.2.11 - 2019-11-06
 
 ### Added
 
@@ -1215,7 +1130,7 @@
 
 [#1878]: https://github.com/actix/actix-web/pull/1878
 
-## 0.2.10
+## 0.2.10 - 2019-09-11
 
 ### Added
 
@@ -1226,7 +1141,7 @@
 - h2 will use error response #1080
 - on_connect result isn't added to request extensions for http2 requests #1009
 
-## 0.2.9
+## 0.2.9 - 2019-08-13
 
 ### Changed
 
@@ -1238,7 +1153,7 @@
 
 - Fixed a panic in the HTTP2 handshake in client HTTP requests (#1031)
 
-## 0.2.8
+## 0.2.8 - 2019-08-01
 
 ### Added
 
@@ -1250,20 +1165,20 @@
 - awc client panic #1016
 - Invalid response with compression middleware enabled, but compression-related features disabled #997
 
-## 0.2.7
+## 0.2.7 - 2019-07-18
 
 ### Added
 
 - Add support for downcasting response errors #986
 
-## 0.2.6
+## 0.2.6 - 2019-07-17
 
 ### Changed
 
 - Replace `ClonableService` with local copy
 - Upgrade `rand` dependency version to 0.7
 
-## 0.2.5
+## 0.2.5 - 2019-06-28
 
 ### Added
 
@@ -1274,13 +1189,13 @@
 - Use `encoding_rs` crate instead of unmaintained `encoding` crate
 - Add `Copy` and `Clone` impls for `ws::Codec`
 
-## 0.2.4
+## 0.2.4 - 2019-06-16
 
 ### Fixed
 
 - Do not compress NoContent (204) responses #918
 
-## 0.2.3
+## 0.2.3 - 2019-06-02
 
 ### Added
 
@@ -1291,19 +1206,19 @@
 
 - SizedStream uses u64
 
-## 0.2.2
+## 0.2.2 - 2019-05-29
 
 ### Fixed
 
 - Parse incoming stream before closing stream on disconnect #868
 
-## 0.2.1
+## 0.2.1 - 2019-05-25
 
 ### Fixed
 
 - Handle socket read disconnect
 
-## 0.2.0
+## 0.2.0 - 2019-05-12
 
 ### Changed
 
@@ -1314,13 +1229,13 @@
 
 - `OneRequest` service
 
-## 0.1.5
+## 0.1.5 - 2019-05-04
 
 ### Fixed
 
 - Clean up response extensions in response pool #817
 
-## 0.1.4
+## 0.1.4 - 2019-04-24
 
 ### Added
 
@@ -1330,20 +1245,20 @@
 
 - Read until eof for http/1.0 responses #771
 
-## 0.1.3
+## 0.1.3 - 2019-04-23
 
 ### Fixed
 
 - Fix http client pool management
 - Fix http client wait queue management #794
 
-## 0.1.2
+## 0.1.2 - 2019-04-23
 
 ### Fixed
 
 - Fix BorrowMutError panic in client connector #793
 
-## 0.1.1
+## 0.1.1 - 2019-04-19
 
 ### Changed
 
@@ -1351,7 +1266,7 @@
 - Cookie::max_age_time() accepts value in time::Duration
 - Allow to specify server address for client connector
 
-## 0.1.0
+## 0.1.0 - 2019-04-16
 
 ### Added
 
@@ -1362,7 +1277,7 @@
 - `actix_http::encoding` always available
 - use trust-dns-resolver 0.11.0
 
-## 0.1.0-alpha.5
+## 0.1.0-alpha.5 - 2019-04-12
 
 ### Added
 
@@ -1374,7 +1289,7 @@
 - MessageBody::length() renamed to MessageBody::size() for consistency
 - ws handshake verification functions take RequestHead instead of Request
 
-## 0.1.0-alpha.4
+## 0.1.0-alpha.4 - 2019-04-08
 
 ### Added
 
@@ -1391,7 +1306,7 @@
 
 - Removed PayloadBuffer
 
-## 0.1.0-alpha.3
+## 0.1.0-alpha.3 - 2019-04-02
 
 ### Added
 
@@ -1403,7 +1318,7 @@
 - Preallocate read buffer for h1 codec
 - Detect socket disconnection during protocol selection
 
-## 0.1.0-alpha.2
+## 0.1.0-alpha.2 - 2019-03-29
 
 ### Added
 
@@ -1413,6 +1328,6 @@
 
 - Do not use thread pool for decompression if chunk size is smaller than 2048.
 
-## 0.1.0-alpha.1
+## 0.1.0-alpha.1 - 2019-03-28
 
 - Initial impl

actix-http/Cargo.toml

@@ -1,124 +1,79 @@
 [package]
 name = "actix-http"
-version = "3.10.0"
+version = "3.3.0"
 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 = ["http2", "ws", "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",
+    "sha1",
 ]
 
 # 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-utils = "3"
 actix-rt = { version = "2.2", default-features = false }
 
-bitflags = "2"
+ahash = "0.8"
+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.17", default-features = false, features = ["alloc"] }
-http = "0.2.7"
+http = "0.2.5"
 httparse = "1.5.1"
 httpdate = "1.0.1"
 itoa = "1"
 language-tags = "0.3"
-mime = "0.3.4"
+mime = "0.3"
 percent-encoding = "2.1"
 pin-project-lite = "0.2"
 smallvec = "1.6.1"
@@ -127,62 +82,61 @@ 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.21", optional = true }
-rand = { version = "0.9", optional = true }
+rand = { version = "0.8", optional = true }
 sha1 = { version = "0.10", optional = true }
 
 # openssl/rustls
-actix-tls = { version = "3.4", default-features = false, optional = true }
+actix-tls = { version = "3", 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.12", optional = true }
 
 [dev-dependencies]
 actix-http-test = { version = "3", features = ["openssl"] }
 actix-server = "2"
-actix-tls = { version = "3.4", features = ["openssl", "rustls-0_23-webpki-roots"] }
+actix-tls = { version = "3", features = ["openssl"] }
 actix-web = "4"
 
 async-stream = "0.3"
-criterion = { version = "0.5", features = ["html_reports"] }
+criterion = { version = "0.4", features = ["html_reports"] }
-divan = "0.1.8"
+env_logger = "0.9"
-env_logger = "0.11"
 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.9"
 regex = "1.3"
 rustversion = "1"
-rustls-pemfile = "2"
+rustls-pemfile = "1"
-serde = { version = "1", features = ["derive"] }
+serde = { version = "1.0", 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"] }
 
-[lints]
-workspace = true
-
 [[example]]
 name = "ws"
-required-features = ["ws", "rustls-0_23"]
+required-features = ["ws", "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.3.0)](https://docs.rs/actix-http/3.3.0)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-http/3.10.0/status.svg)](https://deps.rs/crate/actix-http/3.10.0)
+[![dependency status](https://deps.rs/crate/actix-http/3.3.0/status.svg)](https://deps.rs/crate/actix-http/3.3.0)
 [![Download](https://img.shields.io/crates/d/actix-http.svg)](https://crates.io/crates/actix-http)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
-<!-- prettier-ignore-end -->
+## Documentation & Resources
 
-## Examples
+- [API Documentation](https://docs.rs/actix-http)
+- Minimum Supported Rust Version (MSRV): 1.59
+
+## Example
 
 ```rust
 use std::{env, io};

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

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

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

actix-http/examples/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!"
 }
 

actix-http/examples/echo.rs

@@ -23,7 +23,7 @@ async fn main() -> io::Result<()> {
                         body.extend_from_slice(&item?);
                     }
 
-                    info!("request body: {body:?}");
+                    info!("request body: {:?}", body);
 
                     let res = Response::build(StatusCode::OK)
                         .insert_header(("x-head", HeaderValue::from_static("dummy value!")))
@@ -31,7 +31,8 @@ async fn main() -> io::Result<()> {
 
                     Ok::<_, Error>(res)
                 })
-                .tcp() // No TLS
+                // No TLS
+                .tcp()
         })?
         .run()
         .await

actix-http/examples/h2c-detect.rs

@@ -8,7 +8,7 @@
 
 use std::{convert::Infallible, io};
 
-use actix_http::{body::BodyStream, HttpService, Request, Response, StatusCode};
+use actix_http::{HttpService, Request, Response, StatusCode};
 use actix_server::Server;
 
 #[tokio::main(flavor = "current_thread")]
@@ -19,12 +19,7 @@ async fn main() -> io::Result<()> {
         .bind("h2c-detect", ("127.0.0.1", 8080), || {
             HttpService::build()
                 .finish(|_req: Request| async move {
-                    Ok::<_, Infallible>(Response::build(StatusCode::OK).body(BodyStream::new(
+                    Ok::<_, Infallible>(Response::build(StatusCode::OK).body("Hello!"))
-                        futures_util::stream::iter([
-                            Ok::<_, String>("123".into()),
-                            Err("wertyuikmnbvcxdfty6t".to_owned()),
-                        ]),
-                    )))
                 })
                 .tcp_auto_h2c()
         })?

actix-http/examples/hello-world.rs

@@ -17,13 +17,16 @@ async fn main() -> io::Result<()> {
                     ext.insert(42u32);
                 })
                 .finish(|req: Request| async move {
-                    info!("{req:?}");
+                    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();
-                    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

@@ -22,16 +22,16 @@ async fn main() -> io::Result<()> {
         .bind("streaming-error", ("127.0.0.1", 8080), || {
             HttpService::build()
                 .finish(|req| async move {
-                    info!("{req:?}");
+                    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,
@@ -17,6 +17,7 @@ use bytes::{Bytes, BytesMut};
 use bytestring::ByteString;
 use futures_core::{ready, Stream};
 use tokio_util::codec::Encoder;
+use tracing::{info, trace};
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -27,21 +28,19 @@ 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");
+    info!("handshaking");
     let mut res = ws::handshake(req.head())?;
 
     // handshake will always fail under HTTP/2
 
-    tracing::info!("responding");
+    info!("responding");
     res.message_body(BodyStream::new(Heartbeat::new(ws::Codec::new())))
 }
 
@@ -63,7 +62,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");
+        trace!("poll");
 
         ready!(self.as_mut().interval.poll_tick(cx));
 
@@ -84,27 +83,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<'_>,
@@ -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,6 +104,7 @@ impl MessageBody for BoxBody {
 
 #[cfg(test)]
 mod tests {
+
     use static_assertions::{assert_impl_all, assert_not_impl_any};
 
     use super::*;

actix-http/src/body/message_body.rs

@@ -531,6 +531,7 @@ where
 mod tests {
     use actix_rt::pin;
     use actix_utils::future::poll_fn;
+    use bytes::{Bytes, BytesMut};
     use futures_util::stream;
 
     use super::*;
@@ -554,7 +555,6 @@ mod tests {
         };
     }
 
-    #[allow(unused_allocation)] // triggered by `Box::new(()).size()`
     #[actix_rt::test]
     async fn boxing_equivalence() {
         assert_eq!(().size(), BodySize::Sized(0));

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/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

@@ -211,6 +211,7 @@ where
 
     /// Finish service configuration and create a service for the HTTP/2 protocol.
     #[cfg(feature = "http2")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
     pub fn h2<F, B>(self, service: F) -> crate::h2::H2Service<T, S, B>
     where
         F: IntoServiceFactory<S, Request>,

actix-http/src/config.rs

@@ -132,15 +132,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,9 +9,11 @@ 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;
 
@@ -47,9 +49,9 @@ where
             ))),
 
             #[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(
@@ -191,7 +193,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -205,7 +207,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -218,7 +220,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-zstd")]
@@ -231,7 +233,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
         }
     }
@@ -250,7 +252,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -265,7 +267,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -280,7 +282,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-zstd")]
@@ -295,7 +297,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
         }
     }

actix-http/src/encoding/encoder.rs

@@ -11,10 +11,12 @@ 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;
+
+#[cfg(feature = "compress-gzip")]
+use flate2::write::{GzEncoder, ZlibEncoder};
+
 use tracing::trace;
 #[cfg(feature = "compress-zstd")]
 use zstd::stream::write::Encoder as ZstdEncoder;
@@ -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)
@@ -415,11 +406,11 @@ fn new_brotli_compressor() -> Box<brotli::CompressorWriter<Writer>> {
 #[non_exhaustive]
 pub enum EncoderError {
     /// Wrapped body stream error.
-    #[display("body")]
+    #[display(fmt = "body")]
     Body(Box<dyn StdError>),
 
     /// Generic I/O error.
-    #[display("io")]
+    #[display(fmt = "io")]
     Io(io::Error),
 }
 

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>,
 }
@@ -80,28 +81,28 @@ 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,
 }
 
@@ -160,44 +161,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),
 }
 
@@ -256,28 +257,31 @@ impl From<ParseError> for Response<BoxBody> {
 #[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),
 }
 
@@ -290,6 +294,7 @@ impl std::error::Error for PayloadError {
             PayloadError::Overflow => None,
             PayloadError::UnknownLength => None,
             #[cfg(feature = "http2")]
+            #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
             PayloadError::Http2Payload(err) => Some(err),
             PayloadError::Io(err) => Some(err),
         }
@@ -326,44 +331,44 @@ impl From<PayloadError> for Error {
 #[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")]
+    #[cfg_attr(docsrs, doc(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")]
+    #[display(fmt = "Handler dropped payload before reading EOF")]
     HandlerDroppedPayload,
 
     /// Internal error.
-    #[display("internal error")]
+    #[display(fmt = "Internal error")]
     InternalError,
 }
 
@@ -388,18 +393,20 @@ impl StdError for DispatchError {
 #[cfg_attr(test, derive(PartialEq, Eq))]
 #[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 +426,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 +453,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 +473,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

@@ -31,7 +31,7 @@ impl Hasher for NoOpHasher {
 /// 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>>,
 }
 
@@ -104,46 +104,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/client.rs

@@ -16,7 +16,6 @@ use crate::{
 };
 
 bitflags! {
-    #[derive(Debug, Clone, Copy)]
     struct Flags: u8 {
         const HEAD               = 0b0000_0001;
         const KEEP_ALIVE_ENABLED = 0b0000_1000;

actix-http/src/h1/codec.rs

@@ -9,10 +9,11 @@ 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;
@@ -198,6 +199,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};
@@ -94,7 +94,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 {
@@ -273,7 +275,8 @@ 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 mut length =
+            msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len], ver)?;
 
         // 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
@@ -353,8 +356,8 @@ impl MessageType for ResponseHead {
                         Version::HTTP_10
                     };
 
-                    let status =
+                    let status = StatusCode::from_u16(res.code.unwrap())
-                        StatusCode::from_u16(res.code.unwrap()).map_err(|_| ParseError::Status)?;
+                        .map_err(|_| ParseError::Status)?;
                     HeaderIndex::record(src, res.headers, &mut headers);
 
                     (len, version, status, res.headers.len())
@@ -375,7 +378,8 @@ 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 mut length =
+            msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len], ver)?;
 
         // Remove CL value if 0 now that all headers and HTTP/1.0 special cases are processed.
         // Protects against some request smuggling attacks.
@@ -532,7 +536,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 +567,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 {

actix-http/src/h1/dispatcher.rs

@@ -19,13 +19,6 @@ 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 +27,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;
@@ -212,7 +212,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 +275,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),
@@ -451,7 +455,9 @@ 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 => {
@@ -512,10 +518,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 +555,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(),
@@ -671,7 +674,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 +685,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);
 
@@ -706,7 +714,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
@@ -850,7 +858,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!(
@@ -915,7 +926,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 +943,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) {

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::{pin, time::sleep};
-use actix_service::{fn_service, Service};
+use actix_service::fn_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,8 +53,8 @@ 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 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"))

actix-http/src/h1/encoder.rs

@@ -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);

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

@@ -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();

actix-http/src/h1/service.rs

@@ -15,7 +15,6 @@ 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 +23,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 +82,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 +99,8 @@ where
 
 #[cfg(feature = "openssl")]
 mod openssl {
+    use super::*;
+
     use actix_tls::accept::{
         openssl::{
             reexports::{Error as SslError, SslAcceptor},
@@ -101,8 +109,6 @@ mod openssl {
         TlsError,
     };
 
-    use super::*;
-
     impl<S, B, X, U> H1Service<TlsStream<TcpStream>, S, B, X, U>
     where
         S: ServiceFactory<Request, Config = ()>,
@@ -128,6 +134,7 @@ mod openssl {
         U::InitError: fmt::Debug,
     {
         /// Create OpenSSL based service.
+        #[cfg_attr(docsrs, doc(cfg(feature = "openssl")))]
         pub fn openssl(
             self,
             acceptor: SslAcceptor,
@@ -152,13 +159,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 +196,8 @@ 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.
+        #[cfg_attr(docsrs, doc(cfg(feature = "rustls")))]
         pub fn rustls(
             self,
             config: ServerConfig,
@@ -213,189 +222,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 +306,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| 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| error!("Init http upgrade service error: {:?}", e))?;
                     Some(upgrade)
                 }
                 None => None,
@@ -496,7 +322,7 @@ where
 
             let service = service
                 .await
-                .map_err(|err| error!("Initialization of HTTP service error: {err:?}"))?;
+                .map_err(|e| error!("Init http service error: {:?}", e))?;
 
             Ok(H1ServiceHandler::new(
                 cfg,
@@ -541,6 +367,6 @@ where
 
     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/h2/dispatcher.rs

@@ -4,7 +4,7 @@ use std::{
     future::Future,
     marker::PhantomData,
     net,
-    pin::{pin, Pin},
+    pin::Pin,
     rc::Rc,
     task::{Context, Poll},
 };
@@ -20,6 +20,7 @@ use h2::{
     Ping, PingPong,
 };
 use pin_project_lite::pin_project;
+use tracing::{error, trace, warn};
 
 use crate::{
     body::{BodySize, BoxBody, MessageBody},
@@ -126,7 +127,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();
@@ -146,13 +147,11 @@ 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) => warn!("{:?}", err),
                                 DispatchError::ResponseBody(err) => {
-                                    tracing::error!("Response payload stream error: {err:?}");
+                                    error!("Response payload stream error: {:?}", err)
                                 }
                             }
                         }
@@ -229,9 +228,9 @@ where
         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()))?;
 

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,
 {

actix-http/src/h2/service.rs

@@ -16,7 +16,6 @@ use actix_utils::future::ready;
 use futures_core::{future::LocalBoxFuture, ready};
 use tracing::{error, trace};
 
-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,
@@ -116,6 +117,7 @@ mod openssl {
         B: MessageBody + 'static,
     {
         /// Create OpenSSL based service.
+        #[cfg_attr(docsrs, doc(cfg(feature = "openssl")))]
         pub fn openssl(
             self,
             acceptor: SslAcceptor,
@@ -140,8 +142,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 +164,8 @@ mod rustls_0_20 {
 
         B: MessageBody + 'static,
     {
-        /// Create Rustls v0.20 based service.
+        /// Create Rustls based service.
+        #[cfg_attr(docsrs, doc(cfg(feature = "rustls")))]
         pub fn rustls(
             self,
             mut config: ServerConfig,
@@ -191,159 +194,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 +284,7 @@ where
 
         H2ServiceHandlerResponse {
             state: State::Handshake(
-                Some(Rc::clone(&self.flow)),
+                Some(self.flow.clone()),
                 Some(self.cfg.clone()),
                 addr,
                 on_connect_data,

actix-http/src/header/common.rs

@@ -18,14 +18,6 @@ pub const CACHE_STATUS: HeaderName = HeaderName::from_static("cache-status");
 // 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]).
 ///

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),
         }
     }
 
@@ -384,8 +368,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)
     }
 
@@ -652,34 +636,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 +790,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> {
@@ -1160,7 +1120,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

@@ -3,30 +3,33 @@
 // declaring new header consts will yield this error
 #![allow(clippy::declare_interior_mutable_const)]
 
+use percent_encoding::{AsciiSet, CONTROLS};
+
 // re-export from http except header map related items
 pub use ::http::header::{
     HeaderName, HeaderValue, InvalidHeaderName, InvalidHeaderValue, ToStrError,
 };
+
 // re-export const header names, list is explicit so that any updates to `common` module do not
 // conflict with this set
 pub use ::http::header::{
     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};
 
@@ -40,22 +43,23 @@ mod utils;
 
 pub use self::{
     as_name::AsHeaderName,
-    // re-export list is explicit so that any updates to `http` do not conflict with this set
-    common::{
-        CACHE_STATUS, CDN_CACHE_CONTROL, CLEAR_SITE_DATA, CROSS_ORIGIN_EMBEDDER_POLICY,
-        CROSS_ORIGIN_OPENER_POLICY, CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY,
-        X_FORWARDED_FOR, X_FORWARDED_HOST, X_FORWARDED_PROTO,
-    },
     into_pair::TryIntoHeaderPair,
     into_value::TryIntoHeaderValue,
     map::HeaderMap,
     shared::{
-        parse_extended_value, q, Charset, ContentEncoding, ExtendedValue, HttpDate, LanguageTag,
+        parse_extended_value, q, Charset, ContentEncoding, ExtendedValue, HttpDate,
-        Quality, QualityItem,
+        LanguageTag, Quality, QualityItem,
     },
     utils::{fmt_comma_delimited, from_comma_delimited, from_one_raw_str, http_percent_encode},
 };
 
+// re-export list is explicit so that any updates to `http` do not conflict with this set
+pub use self::common::{
+    CACHE_STATUS, CDN_CACHE_CONTROL, CROSS_ORIGIN_EMBEDDER_POLICY, CROSS_ORIGIN_OPENER_POLICY,
+    CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY, X_FORWARDED_FOR, X_FORWARDED_HOST,
+    X_FORWARDED_PROTO,
+};
+
 /// An interface for types that already represent a valid header.
 pub trait Header: TryIntoHeaderValue {
     /// Returns the name of the header field.

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/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).

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("  "),

actix-http/src/helpers.rs

@@ -61,7 +61,7 @@ pub fn write_content_length<B: BufMut>(n: u64, buf: &mut B, camel_case: bool) {
 /// perform a remaining length check before writing.
 pub(crate) struct MutWriter<'a, B>(pub(crate) &'a mut B);
 
-impl<B> io::Write for MutWriter<'_, B>
+impl<'a, B> io::Write for MutWriter<'a, B>
 where
     B: BufMut,
 {

actix-http/src/http_message.rs

@@ -61,7 +61,9 @@ pub trait HttpMessage: Sized {
     fn encoding(&self) -> Result<&'static Encoding, ContentTypeError> {
         if let Some(mime_type) = self.mime_type()? {
             if let Some(charset) = mime_type.get_param("charset") {
-                if let Some(enc) = Encoding::for_label_no_replacement(charset.as_str().as_bytes()) {
+                if let Some(enc) =
+                    Encoding::for_label_no_replacement(charset.as_str().as_bytes())
+                {
                     Ok(enc)
                 } else {
                     Err(ContentTypeError::UnknownEncoding)
@@ -103,7 +105,7 @@ pub trait HttpMessage: Sized {
     }
 }
 
-impl<T> HttpMessage for &mut T
+impl<'a, T> HttpMessage for &'a mut T
 where
     T: HttpMessage,
 {
@@ -144,7 +146,7 @@ mod tests {
             .finish();
         assert_eq!(req.content_type(), "text/plain");
         let req = TestRequest::default()
-            .insert_header(("content-type", "application/json; charset=utf-8"))
+            .insert_header(("content-type", "application/json; charset=utf=8"))
             .finish();
         assert_eq!(req.content_type(), "application/json");
         let req = TestRequest::default().finish();

actix-http/src/lib.rs

@@ -1,15 +1,11 @@
-//! HTTP types and services for the Actix ecosystem.
+//! HTTP primitives for the Actix ecosystem.
 //!
 //! ## Crate Features
-//!
 //! | Feature             | Functionality                               |
 //! | ------------------- | ------------------------------------------- |
 //! | `http2`             | HTTP/2 support via [h2].                    |
 //! | `openssl`           | TLS support via [OpenSSL].                  |
-//! | `rustls-0_20`       | TLS support via rustls 0.20.                |
+//! | `rustls`            | TLS support via [rustls].                   |
-//! | `rustls-0_21`       | TLS support via rustls 0.21.                |
-//! | `rustls-0_22`       | TLS support via rustls 0.22.                |
-//! | `rustls-0_23`       | TLS support via [rustls] 0.23.              |
 //! | `compress-brotli`   | Payload compression support: Brotli.        |
 //! | `compress-gzip`     | Payload compression support: Deflate, Gzip. |
 //! | `compress-zstd`     | Payload compression support: Zstd.          |
@@ -20,16 +16,20 @@
 //! [rustls]: https://crates.io/crates/rustls
 //! [trust-dns]: https://crates.io/crates/trust-dns
 
+#![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
 #![allow(
     clippy::type_complexity,
     clippy::too_many_arguments,
-    clippy::borrow_interior_mutable_const
+    clippy::borrow_interior_mutable_const,
+    clippy::uninlined_format_args
 )]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
-pub use http::{uri, uri::Uri, Method, StatusCode, Version};
+pub use ::http::{uri, uri::Uri};
+pub use ::http::{Method, StatusCode, Version};
 
 pub mod body;
 mod builder;
@@ -41,6 +41,7 @@ pub mod error;
 mod extensions;
 pub mod h1;
 #[cfg(feature = "http2")]
+#[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
 pub mod h2;
 pub mod header;
 mod helpers;
@@ -55,26 +56,26 @@ mod responses;
 mod service;
 pub mod test;
 #[cfg(feature = "ws")]
+#[cfg_attr(docsrs, doc(cfg(feature = "ws")))]
 pub mod ws;
 
+pub use self::builder::HttpServiceBuilder;
+pub use self::config::ServiceConfig;
+pub use self::error::Error;
+pub use self::extensions::Extensions;
+pub use self::header::ContentEncoding;
+pub use self::http_message::HttpMessage;
+pub use self::keep_alive::KeepAlive;
+pub use self::message::ConnectionType;
+pub use self::message::Message;
 #[allow(deprecated)]
-pub use self::payload::PayloadStream;
+pub use self::payload::{BoxedPayloadStream, Payload, PayloadStream};
-#[cfg(feature = "__tls")]
+pub use self::requests::{Request, RequestHead, RequestHeadType};
+pub use self::responses::{Response, ResponseBuilder, ResponseHead};
+pub use self::service::HttpService;
+#[cfg(any(feature = "openssl", feature = "rustls"))]
+#[cfg_attr(docsrs, doc(cfg(any(feature = "openssl", feature = "rustls"))))]
 pub use self::service::TlsAcceptorConfig;
-pub use self::{
-    builder::HttpServiceBuilder,
-    config::ServiceConfig,
-    error::Error,
-    extensions::Extensions,
-    header::ContentEncoding,
-    http_message::HttpMessage,
-    keep_alive::KeepAlive,
-    message::{ConnectionType, Message},
-    payload::{BoxedPayloadStream, Payload},
-    requests::{Request, RequestHead, RequestHeadType},
-    responses::{Response, ResponseBuilder, ResponseHead},
-    service::HttpService,
-};
 
 /// A major HTTP protocol version.
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]

actix-http/src/message.rs

@@ -16,7 +16,6 @@ pub enum ConnectionType {
 }
 
 bitflags! {
-    #[derive(Debug, Clone, Copy)]
     pub(crate) struct Flags: u8 {
         const CLOSE       = 0b0000_0001;
         const KEEP_ALIVE  = 0b0000_0010;
@@ -66,7 +65,7 @@ impl<T: Head> ops::DerefMut for Message<T> {
 
 impl<T: Head> Drop for Message<T> {
     fn drop(&mut self) {
-        T::with_pool(|p| p.release(Rc::clone(&self.head)))
+        T::with_pool(|p| p.release(self.head.clone()))
     }
 }
 

actix-http/src/notify_on_drop.rs

@@ -5,7 +5,7 @@
 use std::cell::RefCell;
 
 thread_local! {
-    static NOTIFY_DROPPED: RefCell<Option<bool>> = const { RefCell::new(None) };
+    static NOTIFY_DROPPED: RefCell<Option<bool>> = RefCell::new(None);
 }
 
 /// Check if the spawned task is dropped.

actix-http/src/payload.rs

@@ -41,31 +41,13 @@ pin_project! {
 }
 
 impl<S> From<crate::h1::Payload> for Payload<S> {
-    #[inline]
     fn from(payload: crate::h1::Payload) -> Self {
         Payload::H1 { payload }
     }
 }
 
-impl<S> From<Bytes> for Payload<S> {
-    #[inline]
-    fn from(bytes: Bytes) -> Self {
-        let (_, mut pl) = crate::h1::Payload::create(true);
-        pl.unread_data(bytes);
-        self::Payload::from(pl)
-    }
-}
-
-impl<S> From<Vec<u8>> for Payload<S> {
-    #[inline]
-    fn from(vec: Vec<u8>) -> Self {
-        Payload::from(Bytes::from(vec))
-    }
-}
-
 #[cfg(feature = "http2")]
 impl<S> From<crate::h2::Payload> for Payload<S> {
-    #[inline]
     fn from(payload: crate::h2::Payload) -> Self {
         Payload::H2 { payload }
     }
@@ -73,7 +55,6 @@ impl<S> From<crate::h2::Payload> for Payload<S> {
 
 #[cfg(feature = "http2")]
 impl<S> From<::h2::RecvStream> for Payload<S> {
-    #[inline]
     fn from(stream: ::h2::RecvStream) -> Self {
         Payload::H2 {
             payload: crate::h2::Payload::new(stream),
@@ -82,15 +63,13 @@ impl<S> From<::h2::RecvStream> for Payload<S> {
 }
 
 impl From<BoxedPayloadStream> for Payload {
-    #[inline]
     fn from(payload: BoxedPayloadStream) -> Self {
         Payload::Stream { payload }
     }
 }
 
 impl<S> Payload<S> {
-    /// Takes current payload and replaces it with `None` value.
+    /// Takes current payload and replaces it with `None` value
-    #[must_use]
     pub fn take(&mut self) -> Payload<S> {
         mem::replace(self, Payload::None)
     }

actix-http/src/requests/head.rs

@@ -16,10 +16,7 @@ pub struct RequestHead {
     pub uri: Uri,
     pub version: Version,
     pub headers: HeaderMap,
-
-    /// Will only be None when called in unit tests unless set manually.
     pub peer_addr: Option<net::SocketAddr>,
-
     flags: Flags,
 }
 

actix-http/src/requests/mod.rs

@@ -3,7 +3,5 @@
 mod head;
 mod request;
 
-pub use self::{
+pub use self::head::{RequestHead, RequestHeadType};
-    head::{RequestHead, RequestHeadType},
+pub use self::request::Request;
-    request::Request,
-};

actix-http/src/requests/request.rs

@@ -10,7 +10,8 @@ use std::{
 use http::{header, Method, Uri, Version};
 
 use crate::{
-    header::HeaderMap, BoxedPayloadStream, Extensions, HttpMessage, Message, Payload, RequestHead,
+    header::HeaderMap, BoxedPayloadStream, Extensions, HttpMessage, Message, Payload,
+    RequestHead,
 };
 
 /// An HTTP request.
@@ -173,7 +174,7 @@ impl<P> Request<P> {
     /// Peer address is the directly connected peer's socket address. If a proxy is used in front of
     /// the Actix Web server, then it would be address of this proxy.
     ///
-    /// Will only return None when called in unit tests unless set manually.
+    /// Will only return None when called in unit tests.
     #[inline]
     pub fn peer_addr(&self) -> Option<net::SocketAddr> {
         self.head().peer_addr
@@ -233,6 +234,7 @@ impl<P> fmt::Debug for Request<P> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use std::convert::TryFrom;
 
     #[test]
     fn test_basics() {

actix-http/src/responses/builder.rs

@@ -93,7 +93,7 @@ impl ResponseBuilder {
                 Ok((key, value)) => {
                     parts.headers.insert(key, value);
                 }
-                Err(err) => self.err = Some(err.into()),
+                Err(e) => self.err = Some(e.into()),
             };
         }
 
@@ -119,7 +119,7 @@ impl ResponseBuilder {
         if let Some(parts) = self.inner() {
             match header.try_into_pair() {
                 Ok((key, value)) => parts.headers.append(key, value),
-                Err(err) => self.err = Some(err.into()),
+                Err(e) => self.err = Some(e.into()),
             };
         }
 
@@ -193,7 +193,7 @@ impl ResponseBuilder {
                 Ok(value) => {
                     parts.headers.insert(header::CONTENT_TYPE, value);
                 }
-                Err(err) => self.err = Some(err.into()),
+                Err(e) => self.err = Some(e.into()),
             };
         }
         self
@@ -351,9 +351,12 @@ mod tests {
         assert_eq!(resp.headers().get(CONTENT_TYPE).unwrap(), "text/plain");
 
         let resp = Response::build(StatusCode::OK)
-            .content_type(mime::TEXT_JAVASCRIPT)
+            .content_type(mime::APPLICATION_JAVASCRIPT_UTF_8)
             .body(Bytes::new());
-        assert_eq!(resp.headers().get(CONTENT_TYPE).unwrap(), "text/javascript");
+        assert_eq!(
+            resp.headers().get(CONTENT_TYPE).unwrap(),
+            "application/javascript; charset=utf-8"
+        );
     }
 
     #[test]

actix-http/src/responses/mod.rs

@@ -5,5 +5,7 @@ mod head;
 #[allow(clippy::module_inception)]
 mod response;
 
+pub use self::builder::ResponseBuilder;
 pub(crate) use self::head::BoxedResponseHead;
-pub use self::{builder::ResponseBuilder, head::ResponseHead, response::Response};
+pub use self::head::ResponseHead;
+pub use self::response::Response;