.cargo/config.toml

@@ -0,0 +1,12 @@
+[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-all-feature-powerset="hack --workspace --feature-powerset --skip=__compress,io-uring check"
+ci-check-all-feature-powerset-linux="hack --workspace --feature-powerset --skip=__compress check"
+
+# testing
+ci-doctest = "test --workspace --all-features --doc --no-fail-fast -- --nocapture"

.clippy.toml

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

.cspell.yml

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

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-github: [robjtede]

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/PULL_REQUEST_TEMPLATE.md

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

.github/dependabot.yml

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

.github/workflows/bench.yml

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

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

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

.github/workflows/ci.yml

@@ -3,119 +3,181 @@ name: CI
 on:
   pull_request:
     types: [opened, synchronize, reopened]
-  merge_group:
-    types: [checks_requested]
   push:
     branches: [master]
 
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  read_msrv:
-    name: Read MSRV
-    uses: actions-rust-lang/msrv/.github/workflows/msrv.yml@v0.1.0
-
   build_and_test:
-    needs: read_msrv
-
     strategy:
       fail-fast: false
       matrix:
-        # prettier-ignore
         target:
           - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
-          - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
+          - { name: Windows, os: windows-2022, triple: x86_64-pc-windows-msvc }
         version:
-          - { name: msrv, version: "${{ needs.read_msrv.outputs.msrv }}" }
+          - 1.52.0 # MSRV
-          - { name: stable, version: stable }
+          - stable
+          - 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
+
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
-
-      - name: Install nasm
-        if: matrix.target.os == 'windows-latest'
-        uses: ilammy/setup-nasm@v1.5.2
 
+      # install OpenSSL on Windows
+      # TODO: GitHub actions docs state that OpenSSL is
+      # already installed on these Windows machines somewhere
+      - name: Set vcpkg root
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc'
+        run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
       - name: Install OpenSSL
-        if: matrix.target.os == 'windows-latest'
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc'
-        shell: bash
+        run: vcpkg install openssl:x64-windows
-        run: |
-          set -e
-          choco install openssl --version=1.1.1.2100 -y --no-progress
-          echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' >> $GITHUB_ENV
-          echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
 
-      - name: Setup mold linker
+      - name: Install ${{ matrix.version }}
-        if: matrix.target.os == 'ubuntu-latest'
+        uses: actions-rs/toolchain@v1
-        uses: rui314/setup-mold@v1
-
-      - name: Install Rust (${{ matrix.version.name }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
         with:
-          toolchain: ${{ matrix.version.version }}
+          toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
+          profile: minimal
+          override: true
 
-      - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
+      - name: Generate Cargo.lock
-        uses: taiki-e/install-action@v2.49.45
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
+
+      - name: Install cargo-hack
+        uses: actions-rs/cargo@v1
         with:
-          tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
+          command: install
-
+          args: cargo-hack
-      - name: workaround MSRV issues
-        if: matrix.version.name == 'msrv'
-        run: just downgrade-for-msrv
 
       - name: check minimal
-        run: just check-min
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-min }
 
       - name: check default
-        run: just check-default
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-default }
 
       - name: tests
         timeout-minutes: 60
-        run: just test
+        run: |
-
+          cargo test --lib --tests -p=actix-router --all-features
-      - name: CI cache clean
+          cargo test --lib --tests -p=actix-http --all-features
-        run: cargo-ci-cache-clean
+          cargo test --lib --tests -p=actix-web --features=rustls,openssl -- --skip=test_reading_deflate_encoding_large_random_rustls
-
+          cargo test --lib --tests -p=actix-web-codegen --all-features
-  io-uring:
+          cargo test --lib --tests -p=awc --all-features
-    name: io-uring tests
+          cargo test --lib --tests -p=actix-http-test --all-features
-    runs-on: ubuntu-latest
+          cargo test --lib --tests -p=actix-test --all-features
-    steps:
+          cargo test --lib --tests -p=actix-files
-      - uses: actions/checkout@v4
+          cargo test --lib --tests -p=actix-multipart --all-features
-
+          cargo test --lib --tests -p=actix-web-actors --all-features
-      - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
-        with:
-          toolchain: nightly
 
       - name: tests (io-uring)
+        if: matrix.target.os == 'ubuntu-latest'
         timeout-minutes: 60
         run: >
-          sudo bash -c "ulimit -Sl 512 && ulimit -Hl 512 && PATH=$PATH:/usr/share/rust/.cargo/bin && RUSTUP_TOOLCHAIN=stable cargo test --lib --tests -p=actix-files --all-features"
+          sudo bash -c "ulimit -Sl 512
+          && ulimit -Hl 512
+          && PATH=$PATH:/usr/share/rust/.cargo/bin
+          && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo test --lib --tests -p=actix-files --all-features"
+
+      - name: Clear the cargo caches
+        run: |
+          cargo install cargo-cache --version 0.6.3 --no-default-features --features ci-autoclean
+          cargo-cache
+
+  ci_feature_powerset_check:
+    name: Verify Feature Combinations
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
+
+      - name: Install cargo-hack
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cargo-hack
+
+      - name: check feature combinations
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-all-feature-powerset }
+      
+      - name: check feature combinations
+        uses: actions-rs/cargo@v1
+        with: { command: ci-check-all-feature-powerset-linux }
+
+  coverage:
+    name: coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with: { command: generate-lockfile }
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.2.0
+
+      - name: Generate coverage file
+        if: github.ref == 'refs/heads/master'
+        run: |
+          cargo install cargo-tarpaulin --vers "^0.13"
+          cargo tarpaulin --workspace --features=rustls,openssl --out Xml --verbose
+      - name: Upload to Codecov
+        if: github.ref == 'refs/heads/master'
+        uses: codecov/codecov-action@v1
+        with: { file: cobertura.xml }
 
   rustdoc:
     name: doc tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1.11.0
+        uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
 
-      - name: Install just
+      - name: Generate Cargo.lock
-        uses: taiki-e/install-action@v2.49.45
+        uses: actions-rs/cargo@v1
-        with:
+        with: { command: generate-lockfile }
-          tool: just
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.3.0
 
       - name: doc tests
-        run: just test-docs
+        uses: actions-rs/cargo@v1
+        timeout-minutes: 60
+        with: { command: ci-doctest }

.github/workflows/clippy-fmt.yml

@@ -0,0 +1,39 @@
+name: Lint
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          components: rustfmt
+      - name: Check with rustfmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          components: clippy
+          override: true
+      - name: Check with Clippy
+        uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --workspace --all-features --tests

.github/workflows/coverage.yml

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

.github/workflows/lint.yml

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

.github/workflows/upload-doc.yml

@@ -0,0 +1,35 @@
+name: Upload Documentation
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly-x86_64-unknown-linux-gnu
+          profile: minimal
+          override: true
+
+      - name: Build Docs
+        uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --workspace --all-features --no-deps
+
+      - name: Tweak HTML
+        run: echo '<meta http-equiv="refresh" content="0;url=actix_web/index.html">' > target/doc/index.html
+
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@3.7.1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: target/doc

.gitignore

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

.prettierrc.yml

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

.rustfmt.toml

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

CHANGES.md

@@ -1,5 +1,849 @@
-# Changelog
+# Changes
 
-Changelogs are kept separately for each crate in this repo.
+## Unreleased - 2021-xx-xx
 
-Actix Web changelog [is now here →](./actix-web/CHANGES.md).
+
+## 4.0.0-beta.13 - 2021-11-30
+### Changed
+* Update `actix-tls` to `3.0.0-rc.1`. [#2474]
+
+[#2474]: https://github.com/actix/actix-web/pull/2474
+
+
+## 4.0.0-beta.12 - 2021-11-22
+### Changed
+* Compress middleware's response type is now `AnyBody<Encoder<B>>`. [#2448]
+
+### Fixed
+* Relax `Unpin` bound on `S` (stream) parameter of `HttpResponseBuilder::streaming`. [#2448]
+
+### Removed
+* `dev::ResponseBody` re-export; is function is replaced by the new `dev::AnyBody` enum. [#2446]
+
+[#2446]: https://github.com/actix/actix-web/pull/2446
+[#2448]: https://github.com/actix/actix-web/pull/2448
+
+
+## 4.0.0-beta.11 - 2021-11-15
+### Added
+* Re-export `dev::ServerHandle` from `actix-server`. [#2442]
+
+### Changed
+* `ContentType::html` now produces `text/html; charset=utf-8` instead of `text/html`. [#2423]
+* Update `actix-server` to `2.0.0-beta.9`. [#2442]
+
+[#2423]: https://github.com/actix/actix-web/pull/2423
+[#2442]: https://github.com/actix/actix-web/pull/2442
+
+
+## 4.0.0-beta.10 - 2021-10-20
+### Added
+* Option to allow `Json` extractor to work without a `Content-Type` header present. [#2362]
+* `#[actix_web::test]` macro for setting up tests with a runtime. [#2409]
+
+### Changed
+* Associated type `FromRequest::Config` was removed. [#2233]
+* Inner field made private on `web::Payload`. [#2384]
+* `Data::into_inner` and `Data::get_ref` no longer requires `T: Sized`. [#2403]
+* Updated rustls to v0.20. [#2414]
+* Minimum supported Rust version (MSRV) is now 1.52.
+
+### Removed
+* Useless `ServiceResponse::checked_expr` method. [#2401]
+
+[#2233]: https://github.com/actix/actix-web/pull/2233
+[#2362]: https://github.com/actix/actix-web/pull/2362
+[#2384]: https://github.com/actix/actix-web/pull/2384
+[#2401]: https://github.com/actix/actix-web/pull/2401
+[#2403]: https://github.com/actix/actix-web/pull/2403
+[#2409]: https://github.com/actix/actix-web/pull/2409
+[#2414]: https://github.com/actix/actix-web/pull/2414
+
+
+## 4.0.0-beta.9 - 2021-09-09
+### Added
+* Re-export actix-service `ServiceFactory` in `dev` module. [#2325]
+
+### Changed
+* Compress middleware will return 406 Not Acceptable when no content encoding is acceptable to the client. [#2344]
+* Move `BaseHttpResponse` to `dev::Response`. [#2379]
+* Enable `TestRequest::param` to accept more than just static strings. [#2172]
+* Minimum supported Rust version (MSRV) is now 1.51.
+
+### Fixed
+* Fix quality parse error in Accept-Encoding header. [#2344]
+* Re-export correct type at `web::HttpResponse`. [#2379]
+
+[#2172]: https://github.com/actix/actix-web/pull/2172
+[#2325]: https://github.com/actix/actix-web/pull/2325
+[#2344]: https://github.com/actix/actix-web/pull/2344
+[#2379]: https://github.com/actix/actix-web/pull/2379
+
+
+## 4.0.0-beta.8 - 2021-06-26
+### Added
+* Add `ServiceRequest::parts_mut`. [#2177]
+* Add extractors for `Uri` and `Method`. [#2263]
+* Add extractors for `ConnectionInfo` and `PeerAddr`. [#2263]
+* Add `Route::service` for using hand-written services as handlers. [#2262]
+
+### Changed
+* Change compression algorithm features flags. [#2250]
+* Deprecate `App::data` and `App::data_factory`. [#2271]
+* Smarter extraction of `ConnectionInfo` parts. [#2282]
+
+### Fixed
+* Scope and Resource middleware can access data items set on their own layer. [#2288]
+
+[#2177]: https://github.com/actix/actix-web/pull/2177
+[#2250]: https://github.com/actix/actix-web/pull/2250
+[#2271]: https://github.com/actix/actix-web/pull/2271
+[#2262]: https://github.com/actix/actix-web/pull/2262
+[#2263]: https://github.com/actix/actix-web/pull/2263
+[#2282]: https://github.com/actix/actix-web/pull/2282
+[#2288]: https://github.com/actix/actix-web/pull/2288
+
+
+## 4.0.0-beta.7 - 2021-06-17
+### Added
+* `HttpServer::worker_max_blocking_threads` for setting block thread pool. [#2200]
+
+### Changed
+* Adjusted default JSON payload limit to 2MB (from 32kb) and included size and limits in the `JsonPayloadError::Overflow` error variant. [#2162]
+[#2162]: (https://github.com/actix/actix-web/pull/2162)
+* `ServiceResponse::error_response` now uses body type of `Body`. [#2201]
+* `ServiceResponse::checked_expr` now returns a `Result`. [#2201]
+* Update `language-tags` to `0.3`.
+* `ServiceResponse::take_body`. [#2201]
+* `ServiceResponse::map_body` closure receives and returns `B` instead of `ResponseBody<B>` types. [#2201]
+* All error trait bounds in server service builders have changed from `Into<Error>` to `Into<Response<AnyBody>>`. [#2253]
+* All error trait bounds in message body and stream impls changed from `Into<Error>` to `Into<Box<dyn std::error::Error>>`. [#2253]
+* `HttpServer::{listen_rustls(), bind_rustls()}` now honor the ALPN protocols in the configuation parameter. [#2226]
+* `middleware::normalize` now will not try to normalize URIs with no valid path [#2246]
+
+### Removed
+* `HttpResponse::take_body` and old `HttpResponse::into_body` method that casted body type. [#2201]
+
+[#2200]: https://github.com/actix/actix-web/pull/2200
+[#2201]: https://github.com/actix/actix-web/pull/2201
+[#2253]: https://github.com/actix/actix-web/pull/2253
+[#2246]: https://github.com/actix/actix-web/pull/2246
+
+
+## 4.0.0-beta.6 - 2021-04-17
+### Added
+* `HttpResponse` and `HttpResponseBuilder` structs. [#2065]
+
+### Changed
+* Most error types are now marked `#[non_exhaustive]`. [#2148]
+* Methods on `ContentDisposition` that took `T: AsRef<str>` now take `impl AsRef<str>`.
+
+[#2065]: https://github.com/actix/actix-web/pull/2065
+[#2148]: https://github.com/actix/actix-web/pull/2148
+
+
+## 4.0.0-beta.5 - 2021-04-02
+### Added
+* `Header` extractor for extracting common HTTP headers in handlers. [#2094]
+* Added `TestServer::client_headers` method. [#2097]
+
+### Fixed
+* Double ampersand in Logger format is escaped correctly. [#2067]
+
+### Changed
+* `CustomResponder` would return error as `HttpResponse` when `CustomResponder::with_header` failed
+  instead of skipping. (Only the first error is kept when multiple error occur) [#2093]
+
+### Removed
+* The `client` mod was removed. Clients should now use `awc` directly.
+  [871ca5e4](https://github.com/actix/actix-web/commit/871ca5e4ae2bdc22d1ea02701c2992fa8d04aed7)
+* Integration testing was moved to new `actix-test` crate. Namely these items from the `test`
+  module: `TestServer`, `TestServerConfig`, `start`, `start_with`, and `unused_addr`. [#2112]
+
+[#2067]: https://github.com/actix/actix-web/pull/2067
+[#2093]: https://github.com/actix/actix-web/pull/2093
+[#2094]: https://github.com/actix/actix-web/pull/2094
+[#2097]: https://github.com/actix/actix-web/pull/2097
+[#2112]: https://github.com/actix/actix-web/pull/2112
+
+
+## 4.0.0-beta.4 - 2021-03-09
+### Changed
+* Feature `cookies` is now optional and enabled by default. [#1981]
+* `JsonBody::new` returns a default limit of 32kB to be consistent with `JsonConfig` and the default
+  behaviour of the `web::Json<T>` extractor. [#2010]
+
+[#1981]: https://github.com/actix/actix-web/pull/1981
+[#2010]: https://github.com/actix/actix-web/pull/2010
+
+
+## 4.0.0-beta.3 - 2021-02-10
+* Update `actix-web-codegen` to `0.5.0-beta.1`.
+
+
+## 4.0.0-beta.2 - 2021-02-10
+### Added
+* The method `Either<web::Json<T>, web::Form<T>>::into_inner()` which returns the inner type for
+  whichever variant was created. Also works for `Either<web::Form<T>, web::Json<T>>`. [#1894]
+* Add `services!` macro for helping register multiple services to `App`. [#1933]
+* Enable registering a vec of services of the same type to `App` [#1933]
+
+### Changed
+* Rework `Responder` trait to be sync and returns `Response`/`HttpResponse` directly.
+  Making it simpler and more performant. [#1891]
+* `ServiceRequest::into_parts` and `ServiceRequest::from_parts` can no longer fail. [#1893]
+* `ServiceRequest::from_request` can no longer fail. [#1893]
+* Our `Either` type now uses `Left`/`Right` variants (instead of `A`/`B`) [#1894]
+* `test::{call_service, read_response, read_response_json, send_request}` take `&Service`
+  in argument [#1905]
+* `App::wrap_fn`, `Resource::wrap_fn` and `Scope::wrap_fn` provide `&Service` in closure
+  argument. [#1905]
+* `web::block` no longer requires the output is a Result. [#1957]
+
+### Fixed
+* Multiple calls to `App::data` with the same type now keeps the latest call's data. [#1906]
+
+### Removed
+* Public field of `web::Path` has been made private. [#1894]
+* Public field of `web::Query` has been made private. [#1894]
+* `TestRequest::with_header`; use `TestRequest::default().insert_header()`. [#1869]
+* `AppService::set_service_data`; for custom HTTP service factories adding application data, use the
+  layered data model by calling `ServiceRequest::add_data_container` when handling
+  requests instead. [#1906]
+
+[#1891]: https://github.com/actix/actix-web/pull/1891
+[#1893]: https://github.com/actix/actix-web/pull/1893
+[#1894]: https://github.com/actix/actix-web/pull/1894
+[#1869]: https://github.com/actix/actix-web/pull/1869
+[#1905]: https://github.com/actix/actix-web/pull/1905
+[#1906]: https://github.com/actix/actix-web/pull/1906
+[#1933]: https://github.com/actix/actix-web/pull/1933
+[#1957]: https://github.com/actix/actix-web/pull/1957
+
+
+## 4.0.0-beta.1 - 2021-01-07
+### Added
+* `Compat` middleware enabling generic response body/error type of middlewares like `Logger` and
+  `Compress` to be used in `middleware::Condition` and `Resource`, `Scope` services. [#1865]
+
+### Changed
+* Update `actix-*` dependencies to tokio `1.0` based versions. [#1813]
+* Bumped `rand` to `0.8`.
+* Update `rust-tls` to `0.19`. [#1813]
+* Rename `Handler` to `HandlerService` and rename `Factory` to `Handler`. [#1852]
+* The default `TrailingSlash` is now `Trim`, in line with existing documentation. See migration
+  guide for implications. [#1875]
+* Rename `DefaultHeaders::{content_type => add_content_type}`. [#1875]
+* MSRV is now 1.46.0.
+
+### Fixed
+* Added the underlying parse error to `test::read_body_json`'s panic message. [#1812]
+
+### Removed
+* Public modules `middleware::{normalize, err_handlers}`. All necessary middleware structs are now
+  exposed directly by the `middleware` module.
+* Remove `actix-threadpool` as dependency. `actix_threadpool::BlockingError` error type can be imported 
+  from `actix_web::error` module. [#1878]
+
+[#1812]: https://github.com/actix/actix-web/pull/1812
+[#1813]: https://github.com/actix/actix-web/pull/1813
+[#1852]: https://github.com/actix/actix-web/pull/1852
+[#1865]: https://github.com/actix/actix-web/pull/1865
+[#1875]: https://github.com/actix/actix-web/pull/1875
+[#1878]: https://github.com/actix/actix-web/pull/1878
+
+## 3.3.2 - 2020-12-01
+### Fixed
+* Removed an occasional `unwrap` on `None` panic in `NormalizePathNormalization`. [#1762]
+* Fix `match_pattern()` returning `None` for scope with empty path resource. [#1798]
+* Increase minimum `socket2` version. [#1803]
+
+[#1762]: https://github.com/actix/actix-web/pull/1762
+[#1798]: https://github.com/actix/actix-web/pull/1798
+[#1803]: https://github.com/actix/actix-web/pull/1803
+
+
+## 3.3.1 - 2020-11-29
+* Ensure `actix-http` dependency uses same `serde_urlencoded`.
+
+
+## 3.3.0 - 2020-11-25
+### Added
+* Add `Either<A, B>` extractor helper. [#1788]
+
+### Changed
+* Upgrade `serde_urlencoded` to `0.7`. [#1773]
+
+[#1773]: https://github.com/actix/actix-web/pull/1773
+[#1788]: https://github.com/actix/actix-web/pull/1788
+
+
+## 3.2.0 - 2020-10-30
+### Added
+* Implement `exclude_regex` for Logger middleware. [#1723]
+* Add request-local data extractor `web::ReqData`. [#1748]
+* Add ability to register closure for request middleware logging. [#1749]
+* Add `app_data` to `ServiceConfig`. [#1757]
+* Expose `on_connect` for access to the connection stream before request is handled. [#1754]
+
+### Changed
+* Updated actix-web-codegen dependency for access to new `#[route(...)]` multi-method macro.
+* Print non-configured `Data<T>` type when attempting extraction. [#1743]
+* Re-export bytes::Buf{Mut} in web module. [#1750]
+* Upgrade `pin-project` to `1.0`.
+
+[#1723]: https://github.com/actix/actix-web/pull/1723
+[#1743]: https://github.com/actix/actix-web/pull/1743
+[#1748]: https://github.com/actix/actix-web/pull/1748
+[#1750]: https://github.com/actix/actix-web/pull/1750
+[#1754]: https://github.com/actix/actix-web/pull/1754
+[#1749]: https://github.com/actix/actix-web/pull/1749
+
+
+## 3.1.0 - 2020-09-29
+### Changed
+* Add `TrailingSlash::MergeOnly` behaviour to `NormalizePath`, which allows `NormalizePath`
+  to retain any trailing slashes. [#1695]
+* Remove bound `std::marker::Sized` from `web::Data` to support storing `Arc<dyn Trait>`
+  via `web::Data::from` [#1710]
+
+### Fixed
+* `ResourceMap` debug printing is no longer infinitely recursive. [#1708]
+
+[#1695]: https://github.com/actix/actix-web/pull/1695
+[#1708]: https://github.com/actix/actix-web/pull/1708
+[#1710]: https://github.com/actix/actix-web/pull/1710
+
+
+## 3.0.2 - 2020-09-15
+### Fixed
+* `NormalizePath` when used with `TrailingSlash::Trim` no longer trims the root path "/". [#1678]
+
+[#1678]: https://github.com/actix/actix-web/pull/1678
+
+
+## 3.0.1 - 2020-09-13
+### Changed
+* `middleware::normalize::TrailingSlash` enum is now accessible. [#1673]
+
+[#1673]: https://github.com/actix/actix-web/pull/1673
+
+
+## 3.0.0 - 2020-09-11
+* No significant changes from `3.0.0-beta.4`.
+
+
+## 3.0.0-beta.4 - 2020-09-09
+### Added
+* `middleware::NormalizePath` now has configurable behavior for either always having a trailing 
+  slash, or as the new addition, always trimming trailing slashes. [#1639]
+
+### Changed
+* Update actix-codec and actix-utils dependencies. [#1634]
+* `FormConfig` and `JsonConfig` configurations are now also considered when set
+  using `App::data`. [#1641]
+* `HttpServer::maxconn` is renamed to the more expressive `HttpServer::max_connections`. [#1655]
+* `HttpServer::maxconnrate` is renamed to the more expressive
+  `HttpServer::max_connection_rate`. [#1655]
+
+[#1639]: https://github.com/actix/actix-web/pull/1639
+[#1641]: https://github.com/actix/actix-web/pull/1641
+[#1634]: https://github.com/actix/actix-web/pull/1634
+[#1655]: https://github.com/actix/actix-web/pull/1655
+
+## 3.0.0-beta.3 - 2020-08-17
+### Changed
+* Update `rustls` to 0.18
+
+
+## 3.0.0-beta.2 - 2020-08-17
+### Changed
+* `PayloadConfig` is now also considered in `Bytes` and `String` extractors when set
+  using `App::data`. [#1610]
+* `web::Path` now has a public representation: `web::Path(pub T)` that enables
+  destructuring. [#1594]
+* `ServiceRequest::app_data` allows retrieval of non-Data data without splitting into parts to
+  access `HttpRequest` which already allows this. [#1618]
+* Re-export all error types from `awc`. [#1621]
+* MSRV is now 1.42.0.
+
+### Fixed
+* Memory leak of app data in pooled requests. [#1609]
+
+[#1594]: https://github.com/actix/actix-web/pull/1594
+[#1609]: https://github.com/actix/actix-web/pull/1609
+[#1610]: https://github.com/actix/actix-web/pull/1610
+[#1618]: https://github.com/actix/actix-web/pull/1618
+[#1621]: https://github.com/actix/actix-web/pull/1621
+
+
+## 3.0.0-beta.1 - 2020-07-13
+### Added
+* Re-export `actix_rt::main` as `actix_web::main`.
+* `HttpRequest::match_pattern` and `ServiceRequest::match_pattern` for extracting the matched
+  resource pattern.
+* `HttpRequest::match_name` and `ServiceRequest::match_name` for extracting matched resource name.
+
+### Changed
+* Fix actix_http::h1::dispatcher so it returns when HW_BUFFER_SIZE is reached. Should reduce peak memory consumption during large uploads. [#1550]
+* Migrate cookie handling to `cookie` crate. Actix-web no longer requires `ring` dependency.
+* MSRV is now 1.41.1
+
+### Fixed
+* `NormalizePath` improved consistency when path needs slashes added _and_ removed.
+
+
+## 3.0.0-alpha.3 - 2020-05-21
+### Added
+* Add option to create `Data<T>` from `Arc<T>` [#1509]
+
+### Changed
+* Resources and Scopes can now access non-overridden data types set on App (or containing scopes) when setting their own data. [#1486]
+* Fix audit issue logging by default peer address [#1485]
+* Bump minimum supported Rust version to 1.40
+* Replace deprecated `net2` crate with `socket2`
+
+[#1485]: https://github.com/actix/actix-web/pull/1485
+[#1509]: https://github.com/actix/actix-web/pull/1509
+
+## [3.0.0-alpha.2] - 2020-05-08
+
+### Changed
+
+* `{Resource,Scope}::default_service(f)` handlers now support app data extraction. [#1452]
+* Implement `std::error::Error` for our custom errors [#1422]
+* NormalizePath middleware now appends trailing / so that routes of form /example/ respond to /example requests. [#1433]
+* Remove the `failure` feature and support.
+
+[#1422]: https://github.com/actix/actix-web/pull/1422
+[#1433]: https://github.com/actix/actix-web/pull/1433
+[#1452]: https://github.com/actix/actix-web/pull/1452
+[#1486]: https://github.com/actix/actix-web/pull/1486
+
+
+## [3.0.0-alpha.1] - 2020-03-11
+
+### Added
+
+* Add helper function for creating routes with `TRACE` method guard `web::trace()`
+* Add convenience functions `test::read_body_json()` and `test::TestRequest::send_request()` for testing.
+
+### Changed
+
+* Use `sha-1` crate instead of unmaintained `sha1` crate
+* Skip empty chunks when returning response from a `Stream` [#1308]
+* Update the `time` dependency to 0.2.7
+* Update `actix-tls` dependency to 2.0.0-alpha.1
+* Update `rustls` dependency to 0.17
+
+[#1308]: https://github.com/actix/actix-web/pull/1308
+
+## [2.0.0] - 2019-12-25
+
+### Changed
+
+* Rename `HttpServer::start()` to `HttpServer::run()`
+
+* Allow to gracefully stop test server via `TestServer::stop()`
+
+* Allow to specify multi-patterns for resources
+
+## [2.0.0-rc] - 2019-12-20
+
+### Changed
+
+* Move `BodyEncoding` to `dev` module #1220
+
+* Allow to set `peer_addr` for TestRequest #1074
+
+* Make web::Data deref to Arc<T> #1214
+
+* Rename `App::register_data()` to `App::app_data()`
+
+* `HttpRequest::app_data<T>()` returns `Option<&T>` instead of `Option<&Data<T>>`
+
+### Fixed
+
+* Fix `AppConfig::secure()` is always false. #1202
+
+
+## [2.0.0-alpha.6] - 2019-12-15
+
+### Fixed
+
+* Fixed compilation with default features off
+
+## [2.0.0-alpha.5] - 2019-12-13
+
+### Added
+
+* Add test server, `test::start()` and `test::start_with()`
+
+## [2.0.0-alpha.4] - 2019-12-08
+
+### Deleted
+
+* Delete HttpServer::run(), it is not useful with async/await
+
+## [2.0.0-alpha.3] - 2019-12-07
+
+### Changed
+
+* Migrate to tokio 0.2
+
+
+## [2.0.0-alpha.1] - 2019-11-22
+
+### Changed
+
+* Migrated to `std::future`
+
+* Remove implementation of `Responder` for `()`. (#1167)
+
+
+## [1.0.9] - 2019-11-14
+
+### Added
+
+* Add `Payload::into_inner` method and make stored `def::Payload` public. (#1110)
+
+### Changed
+
+* Support `Host` guards when the `Host` header is unset (e.g. HTTP/2 requests) (#1129)
+
+
+## [1.0.8] - 2019-09-25
+
+### Added
+
+* Add `Scope::register_data` and `Resource::register_data` methods, parallel to
+  `App::register_data`.
+
+* Add `middleware::Condition` that conditionally enables another middleware
+
+* Allow to re-construct `ServiceRequest` from `HttpRequest` and `Payload`
+
+* Add `HttpServer::listen_uds` for ability to listen on UDS FD rather than path,
+  which is useful for example with systemd.
+
+### Changed
+
+* Make UrlEncodedError::Overflow more informative
+
+* Use actix-testing for testing utils
+
+
+## [1.0.7] - 2019-08-29
+
+### Fixed
+
+* Request Extensions leak #1062
+
+
+## [1.0.6] - 2019-08-28
+
+### Added
+
+* Re-implement Host predicate (#989)
+
+* Form implements Responder, returning a `application/x-www-form-urlencoded` response
+
+* Add `into_inner` to `Data`
+
+* Add `test::TestRequest::set_form()` convenience method to automatically serialize data and set
+  the header in test requests.
+
+### Changed
+
+* `Query` payload made `pub`. Allows user to pattern-match the payload.
+
+* Enable `rust-tls` feature for client #1045
+
+* Update serde_urlencoded to 0.6.1
+
+* Update url to 2.1
+
+
+## [1.0.5] - 2019-07-18
+
+### Added
+
+* Unix domain sockets (HttpServer::bind_uds) #92
+
+* Actix now logs errors resulting in "internal server error" responses always, with the `error`
+  logging level
+
+### Fixed
+
+* Restored logging of errors through the `Logger` middleware
+
+
+## [1.0.4] - 2019-07-17
+
+### Added
+
+* Add `Responder` impl for `(T, StatusCode) where T: Responder`
+
+* Allow to access app's resource map via
+  `ServiceRequest::resource_map()` and `HttpRequest::resource_map()` methods.
+
+### Changed
+
+* Upgrade `rand` dependency version to 0.7
+
+
+## [1.0.3] - 2019-06-28
+
+### Added
+
+* Support asynchronous data factories #850
+
+### Changed
+
+*  Use `encoding_rs` crate instead of unmaintained `encoding` crate
+
+
+## [1.0.2] - 2019-06-17
+
+### Changed
+
+* Move cors middleware to `actix-cors` crate.
+
+* Move identity middleware to `actix-identity` crate.
+
+
+## [1.0.1] - 2019-06-17
+
+### Added
+
+* Add support for PathConfig #903
+
+* Add `middleware::identity::RequestIdentity` trait to `get_identity` from `HttpMessage`.
+
+### Changed
+
+* Move cors middleware to `actix-cors` crate.
+
+* Move identity middleware to `actix-identity` crate.
+
+* Disable default feature `secure-cookies`.
+
+* Allow to test an app that uses async actors #897
+
+* Re-apply patch from #637 #894
+
+### Fixed
+
+* HttpRequest::url_for is broken with nested scopes #915
+
+
+## [1.0.0] - 2019-06-05
+
+### Added
+
+* Add `Scope::configure()` method.
+
+* Add `ServiceRequest::set_payload()` method.
+
+* Add `test::TestRequest::set_json()` convenience method to automatically
+  serialize data and set header in test requests.
+
+* Add macros for head, options, trace, connect and patch http methods
+
+### Changed
+
+* Drop an unnecessary `Option<_>` indirection around `ServerBuilder` from `HttpServer`. #863
+
+### Fixed
+
+* Fix Logger request time format, and use rfc3339. #867
+
+* Clear http requests pool on app service drop #860
+
+
+## [1.0.0-rc] - 2019-05-18
+
+### Added
+
+* Add `Query<T>::from_query()` to extract parameters from a query string. #846
+* `QueryConfig`, similar to `JsonConfig` for customizing error handling of query extractors.
+
+### Changed
+
+* `JsonConfig` is now `Send + Sync`, this implies that `error_handler` must be `Send + Sync` too.
+
+### Fixed
+
+* Codegen with parameters in the path only resolves the first registered endpoint #841
+
+
+## [1.0.0-beta.4] - 2019-05-12
+
+### Added
+
+* Allow to set/override app data on scope level
+
+### Changed
+
+* `App::configure` take an `FnOnce` instead of `Fn`
+* Upgrade actix-net crates
+
+
+## [1.0.0-beta.3] - 2019-05-04
+
+### Added
+
+* Add helper function for executing futures `test::block_fn()`
+
+### Changed
+
+* Extractor configuration could be registered with `App::data()`
+  or with `Resource::data()` #775
+
+* Route data is unified with app data, `Route::data()` moved to resource
+  level to `Resource::data()`
+
+* CORS handling without headers #702
+
+* Allow constructing `Data` instances to avoid double `Arc` for `Send + Sync` types.
+
+### Fixed
+
+* Fix `NormalizePath` middleware impl #806
+
+### Deleted
+
+* `App::data_factory()` is deleted.
+
+
+## [1.0.0-beta.2] - 2019-04-24
+
+### Added
+
+* Add raw services support via `web::service()`
+
+* Add helper functions for reading response body `test::read_body()`
+
+* Add support for `remainder match` (i.e "/path/{tail}*")
+
+* Extend `Responder` trait, allow to override status code and headers.
+
+* Store visit and login timestamp in the identity cookie #502
+
+### Changed
+
+* `.to_async()` handler can return `Responder` type #792
+
+### Fixed
+
+* Fix async web::Data factory handling
+
+
+## [1.0.0-beta.1] - 2019-04-20
+
+### Added
+
+* Add helper functions for reading test response body,
+ `test::read_response()` and test::read_response_json()`
+
+* Add `.peer_addr()` #744
+
+* Add `NormalizePath` middleware
+
+### Changed
+
+* Rename `RouterConfig` to `ServiceConfig`
+
+* Rename `test::call_success` to `test::call_service`
+
+* Removed `ServiceRequest::from_parts()` as it is unsafe to create from parts.
+
+* `CookieIdentityPolicy::max_age()` accepts value in seconds
+
+### Fixed
+
+* Fixed `TestRequest::app_data()`
+
+
+## [1.0.0-alpha.6] - 2019-04-14
+
+### Changed
+
+* Allow using any service as default service.
+
+* Remove generic type for request payload, always use default.
+
+* Removed `Decompress` middleware. Bytes, String, Json, Form extractors
+  automatically decompress payload.
+
+* Make extractor config type explicit. Add `FromRequest::Config` associated type.
+
+
+## [1.0.0-alpha.5] - 2019-04-12
+
+### Added
+
+* Added async io `TestBuffer` for testing.
+
+### Deleted
+
+* Removed native-tls support
+
+
+## [1.0.0-alpha.4] - 2019-04-08
+
+### Added
+
+* `App::configure()` allow to offload app configuration to different methods
+
+* Added `URLPath` option for logger
+
+* Added `ServiceRequest::app_data()`, returns `Data<T>`
+
+* Added `ServiceFromRequest::app_data()`, returns `Data<T>`
+
+### Changed
+
+* `FromRequest` trait refactoring
+
+* Move multipart support to actix-multipart crate
+
+### Fixed
+
+* Fix body propagation in Response::from_error. #760
+
+
+## [1.0.0-alpha.3] - 2019-04-02
+
+### Changed
+
+* Renamed `TestRequest::to_service()` to `TestRequest::to_srv_request()`
+
+* Renamed `TestRequest::to_response()` to `TestRequest::to_srv_response()`
+
+* Removed `Deref` impls
+
+### Removed
+
+* Removed unused `actix_web::web::md()`
+
+
+## [1.0.0-alpha.2] - 2019-03-29
+
+### Added
+
+* Rustls support
+
+### Changed
+
+* Use forked cookie
+
+* Multipart::Field renamed to MultipartField
+
+## [1.0.0-alpha.1] - 2019-03-28
+
+### Changed
+
+* Complete architecture re-design.
+
+* Return 405 response if no matching route found within resource #538

CODE_OF_CONDUCT.md

@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
 
 Examples of behavior that contributes to creating a positive environment include:
 
-- Using welcoming and inclusive language
+* Using welcoming and inclusive language
-- Being respectful of differing viewpoints and experiences
+* Being respectful of differing viewpoints and experiences
-- Gracefully accepting constructive criticism
+* Gracefully accepting constructive criticism
-- Focusing on what is best for the community
+* Focusing on what is best for the community
-- Showing empathy towards other community members
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-- The use of sexualized language or imagery and unwelcome sexual attention or advances
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
-- Trolling, insulting/derogatory comments, and personal or political attacks
+* Trolling, insulting/derogatory comments, and personal or political attacks
-- Public or private harassment
+* Public or private harassment
-- Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
-- Other conduct which could reasonably be considered inappropriate in a professional setting
+* Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Our Responsibilities
 

Cargo.toml

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

MIGRATION.md

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

README.md

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

README.md

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

actix-files/CHANGES.md

@@ -1,252 +1,173 @@
 # Changes
 
-## Unreleased
+## Unreleased - 2021-xx-xx
 
-- Minimum supported Rust version (MSRV) is now 1.75.
 
-## 0.6.6
+## 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]
-- Update `tokio-uring` dependency to `0.4`.
+* Add `NamedFile::open_async`. [#2408]
-- Minimum supported Rust version (MSRV) is now 1.72.
+* Fix 304 Not Modified responses to omit the Content-Length header, as per the spec. [#2453]
-
+* The `Responder` impl for `NamedFile` now has a boxed future associated type. [#2408]
-## 0.6.5
+* The `Service` impl for `NamedFileService` now has a boxed future associated type. [#2408]
-
+* Add `impl Clone` for `FilesService`. [#2408]
-- Fix handling of special characters in filenames.
-
-## 0.6.4
-
-- Fix handling of newlines in filenames.
-- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
-
-## 0.6.3
-
-- XHTML files now use `Content-Disposition: inline` instead of `attachment`. [#2903]
-- Minimum supported Rust version (MSRV) is now 1.59 due to transitive `time` dependency.
-- Update `tokio-uring` dependency to `0.4`.
-
-[#2903]: https://github.com/actix/actix-web/pull/2903
-
-## 0.6.2
-
-- Allow partial range responses for video content to start streaming sooner. [#2817]
-- Minimum supported Rust version (MSRV) is now 1.57 due to transitive `time` dependency.
-
-[#2817]: https://github.com/actix/actix-web/pull/2817
-
-## 0.6.1
-
-- Add `NamedFile::{modified, metadata, content_type, content_disposition, encoding}()` getters. [#2021]
-- Update `tokio-uring` dependency to `0.3`.
-- Audio files now use `Content-Disposition: inline` instead of `attachment`. [#2645]
-- Minimum supported Rust version (MSRV) is now 1.56 due to transitive `hashbrown` dependency.
-
-[#2021]: https://github.com/actix/actix-web/pull/2021
-[#2645]: https://github.com/actix/actix-web/pull/2645
-
-## 0.6.0
-
-- No significant changes since `0.6.0-beta.16`.
-
-## 0.6.0-beta.16
-
-- No significant changes since `0.6.0-beta.15`.
-
-## 0.6.0-beta.15
-
-- No significant changes since `0.6.0-beta.14`.
-
-## 0.6.0-beta.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
-
-- The `Files` service now rejects requests with URL paths that include `%2F` (decoded: `/`). [#2398]
-- The `Files` service now correctly decodes `%25` in the URL path to `%` for the file path. [#2398]
-- Minimum supported Rust version (MSRV) is now 1.54.
-
-[#2398]: https://github.com/actix/actix-web/pull/2398
-
-## 0.6.0-beta.12
-
-- No significant changes since `0.6.0-beta.11`.
-
-## 0.6.0-beta.11
-
-- No significant changes since `0.6.0-beta.10`.
-
-## 0.6.0-beta.10
-
-- No significant changes since `0.6.0-beta.9`.
-
-## 0.6.0-beta.9
-
-- Add crate feature `experimental-io-uring`, enabling async file I/O to be utilized. This feature is only available on Linux OSes with recent kernel versions. This feature is semver-exempt. [#2408]
-- Add `NamedFile::open_async`. [#2408]
-- Fix 304 Not Modified responses to omit the Content-Length header, as per the spec. [#2453]
-- The `Responder` impl for `NamedFile` now has a boxed future associated type. [#2408]
-- The `Service` impl for `NamedFileService` now has a boxed future associated type. [#2408]
-- Add `impl Clone` for `FilesService`. [#2408]
 
 [#2408]: https://github.com/actix/actix-web/pull/2408
 [#2453]: https://github.com/actix/actix-web/pull/2453
 
-## 0.6.0-beta.8
 
-- Minimum supported Rust version (MSRV) is now 1.52.
+## 0.6.0-beta.8 - 2021-10-20
+* Minimum supported Rust version (MSRV) is now 1.52.
 
-## 0.6.0-beta.7
 
-- Minimum supported Rust version (MSRV) is now 1.51.
+## 0.6.0-beta.7 - 2021-09-09
+* Minimum supported Rust version (MSRV) is now 1.51.
 
-## 0.6.0-beta.6
 
-- Added `Files::path_filter()`. [#2274]
+## 0.6.0-beta.6 - 2021-06-26
-- `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]
+* Added `Files::path_filter()`. [#2274]
+* `Files::show_files_listing()` can now be used with `Files::index_file()` to show files listing as a fallback when the index file is not found. [#2228]
 
 [#2274]: https://github.com/actix/actix-web/pull/2274
 [#2228]: https://github.com/actix/actix-web/pull/2228
 
-## 0.6.0-beta.5
 
-- `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]
+## 0.6.0-beta.5 - 2021-06-17
-- For symbolic links, `Content-Disposition` header no longer shows the filename of the original file. [#2156]
+* `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]
-- `Files::redirect_to_slash_directory()` now works as expected when used with `Files::show_files_listing()`. [#2225]
+* For symbolic links, `Content-Disposition` header no longer shows the filename of the original file. [#2156]
-- `application/{javascript, json, wasm}` mime type now have `inline` disposition by default. [#2257]
+* `Files::redirect_to_slash_directory()` now works as expected when used with `Files::show_files_listing()`. [#2225]
+* `application/{javascript, json, wasm}` mime type now have `inline` disposition by default. [#2257]
 
 [#2135]: https://github.com/actix/actix-web/pull/2135
 [#2156]: https://github.com/actix/actix-web/pull/2156
 [#2225]: https://github.com/actix/actix-web/pull/2225
 [#2257]: https://github.com/actix/actix-web/pull/2257
 
-## 0.6.0-beta.4
 
-- Add support for `.guard` in `Files` to selectively filter `Files` services. [#2046]
+## 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
 
-- No notable changes.
+## 0.6.0-beta.3 - 2021-03-09
+* No notable changes.
 
-## 0.6.0-beta.2
 
-- Fix If-Modified-Since and If-Unmodified-Since to not compare using sub-second timestamps. [#1887]
+## 0.6.0-beta.2 - 2021-02-10
-- Replace `v_htmlescape` with `askama_escape`. [#1953]
+* Fix If-Modified-Since and If-Unmodified-Since to not compare using sub-second timestamps. [#1887]
+* Replace `v_htmlescape` with `askama_escape`. [#1953]
 
 [#1887]: https://github.com/actix/actix-web/pull/1887
 [#1953]: https://github.com/actix/actix-web/pull/1953
 
-## 0.6.0-beta.1
 
-- `HttpRange::parse` now has its own error type.
+## 0.6.0-beta.1 - 2021-01-07
-- Update `bytes` to `1.0`. [#1813]
+* `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
 
-- Optionally support hidden files/directories. [#1811]
+## 0.5.0 - 2020-12-26
+* Optionally support hidden files/directories. [#1811]
 
 [#1811]: https://github.com/actix/actix-web/pull/1811
 
-## 0.4.1
 
-- Clarify order of parameters in `Files::new` and improve docs.
+## 0.4.1 - 2020-11-24
+* Clarify order of parameters in `Files::new` and improve docs.
 
-## 0.4.0
 
-- Add `Files::prefer_utf8` option that adds UTF-8 charset on certain response types. [#1714]
+## 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
 
-- No significant changes from 0.3.0-beta.1.
+## 0.3.0 - 2020-09-11
+* No significant changes from 0.3.0-beta.1.
 
-## 0.3.0-beta.1
 
-- Update `v_htmlescape` to 0.10
+## 0.3.0-beta.1 - 2020-07-15
-- Update `actix-web` and `actix-http` dependencies to beta.1
+* Update `v_htmlescape` to 0.10
+* Update `actix-web` and `actix-http` dependencies to beta.1
 
-## 0.3.0-alpha.1
 
-- Update `actix-web` and `actix-http` dependencies to alpha
+## 0.3.0-alpha.1 - 2020-05-23
-- Fix some typos in the docs
+* Update `actix-web` and `actix-http` dependencies to alpha
-- Bump minimum supported Rust version to 1.40
+* Fix some typos in the docs
-- Support sending Content-Length when Content-Range is specified [#1384]
+* Bump minimum supported Rust version to 1.40
+* Support sending Content-Length when Content-Range is specified [#1384]
 
 [#1384]: https://github.com/actix/actix-web/pull/1384
 
-## 0.2.1
 
-- Use the same format for file URLs regardless of platforms
+## 0.2.1 - 2019-12-22
+* Use the same format for file URLs regardless of platforms
 
-## 0.2.0
 
-- Fix BodyEncoding trait import #1220
+## 0.2.0 - 2019-12-20
+* Fix BodyEncoding trait import #1220
 
-## 0.2.0-alpha.1
 
-- Migrate to `std::future`
+## 0.2.0-alpha.1 - 2019-12-07
+* Migrate to `std::future`
 
-## 0.1.7
 
-- Add an additional `filename*` param in the `Content-Disposition` header of `actix_files::NamedFile` to be more compatible. (#1151)
+## 0.1.7 - 2019-11-06
+* Add an additional `filename*` param in the `Content-Disposition` header of
+  `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
 
-- 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
 
-- 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
 
-- 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
 
-- 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
 
-- 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
 
-- 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
 
-- 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
 
-- 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
 
-- Update actix-web to beta.1
 
-## 0.1.0-alpha.6
+## 0.1.0-alpha.6 - 2019-04-14
+* Update actix-web to alpha6
 
-- Update actix-web to alpha6
 
-## 0.1.0-alpha.4
+## 0.1.0-alpha.4 - 2019-04-08
+* Update actix-web to alpha4
 
-- Update actix-web to alpha4
 
-## 0.1.0-alpha.2
+## 0.1.0-alpha.2 - 2019-04-02
+* Add default handler support
 
-- Add default handler support
 
-## 0.1.0-alpha.1
+## 0.1.0-alpha.1 - 2019-03-28
-
+* Initial impl
-- Initial impl

actix-files/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
 name = "actix-files"
-version = "0.6.6"
+version = "0.6.0-beta.9"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
+    "fakeshadow <24548779@qq.com>",
     "Rob Ede <robjtede@icloud.com>",
 ]
 description = "Static file serving for Actix Web"
@@ -11,49 +12,36 @@ homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-web"
 categories = ["asynchronous", "web-programming::http-server"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2018"
 
-[package.metadata.cargo_check_external_types]
+[lib]
-allowed_external_types = [
+name = "actix_files"
-    "actix_http::*",
+path = "src/lib.rs"
-    "actix_service::*",
-    "actix_web::*",
-    "http::*",
-    "mime::*",
-]
 
 [features]
 experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
 
 [dependencies]
-actix-http = "3"
+actix-web = { version = "4.0.0-beta.11", default-features = false }
+actix-http = "3.0.0-beta.14"
 actix-service = "2"
 actix-utils = "3"
-actix-web = { version = "4", default-features = false }
 
-bitflags = "2"
+askama_escape = "0.10"
+bitflags = "1"
 bytes = "1"
-derive_more = { version = "2", features = ["display", "error", "from"] }
+futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
-futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 http-range = "0.1.4"
+derive_more = "0.99.5"
 log = "0.4"
-mime = "0.3.9"
+mime = "0.3"
 mime_guess = "2.0.1"
 percent-encoding = "2.1"
 pin-project-lite = "0.2.7"
-v_htmlescape = "0.15.5"
 
-# experimental-io-uring
+tokio-uring = { version = "0.1", optional = true }
-[target.'cfg(target_os = "linux")'.dependencies]
-tokio-uring = { version = "0.5", optional = true, features = ["bytes"] }
-actix-server = { version = "2.4", optional = true } # ensure matching tokio-uring versions
 
 [dev-dependencies]
-actix-rt = "2.7"
+actix-rt = "2.2"
-actix-test = "0.1"
+actix-web = "4.0.0-beta.11"
-actix-web = "4"
+actix-test = "0.1.0-beta.7"
-env_logger = "0.11"
-tempfile = "3.2"
-
-[lints]
-workspace = true

actix-files/README.md

@@ -1,32 +1,18 @@
-# `actix-files`
+# actix-files
 
-<!-- prettier-ignore-start -->
+> Static file serving for Actix Web
 
 [![crates.io](https://img.shields.io/crates/v/actix-files?label=latest)](https://crates.io/crates/actix-files)
-[![Documentation](https://docs.rs/actix-files/badge.svg?version=0.6.6)](https://docs.rs/actix-files/0.6.6)
+[![Documentation](https://docs.rs/actix-files/badge.svg?version=0.6.0-beta.9)](https://docs.rs/actix-files/0.6.0-beta.9)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![License](https://img.shields.io/crates/l/actix-files.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-files/0.6.6/status.svg)](https://deps.rs/crate/actix-files/0.6.6)
+[![dependency status](https://deps.rs/crate/actix-files/0.6.0-beta.9/status.svg)](https://deps.rs/crate/actix-files/0.6.0-beta.9)
 [![Download](https://img.shields.io/crates/d/actix-files.svg)](https://crates.io/crates/actix-files)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
-<!-- prettier-ignore-end -->
+## Documentation & Resources
 
-<!-- cargo-rdme start -->
+- [API Documentation](https://docs.rs/actix-files/)
-
+- [Example Project](https://github.com/actix/examples/tree/master/basics/static_index)
-Static file serving for Actix Web.
+- Minimum Supported Rust Version (MSRV): 1.52
-
-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

@@ -6,9 +6,8 @@ use std::{
     task::{Context, Poll},
 };
 
-use actix_web::{error::Error, web::Bytes};
+use actix_web::error::Error;
-#[cfg(feature = "experimental-io-uring")]
+use bytes::Bytes;
-use bytes::BytesMut;
 use futures_core::{ready, Stream};
 use pin_project_lite::pin_project;
 
@@ -80,7 +79,7 @@ async fn chunked_read_file_callback(
 ) -> Result<(File, Bytes), Error> {
     use io::{Read as _, Seek as _};
 
-    let res = actix_web::web::block(move || {
+    let res = actix_web::rt::task::spawn_blocking(move || {
         let mut buf = Vec::with_capacity(max_bytes);
 
         file.seek(io::SeekFrom::Start(offset))?;
@@ -93,7 +92,8 @@ async fn chunked_read_file_callback(
             Ok((file, Bytes::from(buf)))
         }
     })
-    .await??;
+    .await
+    .map_err(|_| actix_web::error::BlockingError)??;
 
     Ok(res)
 }
@@ -215,3 +215,64 @@ where
         }
     }
 }
+
+#[cfg(feature = "experimental-io-uring")]
+use bytes_mut::BytesMut;
+
+// TODO: remove new type and use bytes::BytesMut directly
+#[doc(hidden)]
+#[cfg(feature = "experimental-io-uring")]
+mod bytes_mut {
+    use std::ops::{Deref, DerefMut};
+
+    use tokio_uring::buf::{IoBuf, IoBufMut};
+
+    #[derive(Debug)]
+    pub struct BytesMut(bytes::BytesMut);
+
+    impl BytesMut {
+        pub(super) fn new() -> Self {
+            Self(bytes::BytesMut::new())
+        }
+    }
+
+    impl Deref for BytesMut {
+        type Target = bytes::BytesMut;
+
+        fn deref(&self) -> &Self::Target {
+            &self.0
+        }
+    }
+
+    impl DerefMut for BytesMut {
+        fn deref_mut(&mut self) -> &mut Self::Target {
+            &mut self.0
+        }
+    }
+
+    unsafe impl IoBuf for BytesMut {
+        fn stable_ptr(&self) -> *const u8 {
+            self.0.as_ptr()
+        }
+
+        fn bytes_init(&self) -> usize {
+            self.0.len()
+        }
+
+        fn bytes_total(&self) -> usize {
+            self.0.capacity()
+        }
+    }
+
+    unsafe impl IoBufMut for BytesMut {
+        fn stable_mut_ptr(&mut self) -> *mut u8 {
+            self.0.as_mut_ptr()
+        }
+
+        unsafe fn set_init(&mut self, init_len: usize) {
+            if self.len() < init_len {
+                self.0.set_len(init_len);
+            }
+        }
+    }
+}

actix-files/src/directory.rs

@@ -1,13 +1,8 @@
-use std::{
+use std::{fmt::Write, fs::DirEntry, io, path::Path, path::PathBuf};
-    fmt::Write,
-    fs::DirEntry,
-    io,
-    path::{Path, PathBuf},
-};
 
 use actix_web::{dev::ServiceResponse, HttpRequest, HttpResponse};
+use askama_escape::{escape as escape_html_entity, Html};
 use percent_encoding::{utf8_percent_encode, CONTROLS};
-use v_htmlescape::escape as escape_html_entity;
 
 /// A directory; responds with the generated directory listing.
 #[derive(Debug)]
@@ -45,26 +40,17 @@ impl Directory {
 pub(crate) type DirectoryRenderer =
     dyn Fn(&Directory, &HttpRequest) -> Result<ServiceResponse, io::Error>;
 
-/// Returns percent encoded file URL path.
+// show file url as relative to static path
 macro_rules! encode_file_url {
     ($path:ident) => {
         utf8_percent_encode(&$path, CONTROLS)
     };
 }
 
-/// Returns HTML entity encoded formatter.
+// " -- &quot;  & -- &amp;  ' -- &#x27;  < -- &lt;  > -- &gt;  / -- &#x2f;
-///
-/// ```plain
-/// " => &quot;
-/// & => &amp;
-/// ' => &#x27;
-/// < => &lt;
-/// > => &gt;
-/// / => &#x2f;
-/// ```
 macro_rules! encode_file_name {
     ($entry:ident) => {
-        escape_html_entity(&$entry.file_name().to_string_lossy())
+        escape_html_entity(&$entry.file_name().to_string_lossy(), Html)
     };
 }
 
@@ -80,7 +66,7 @@ pub(crate) fn directory_listing(
         if dir.is_visible(&entry) {
             let entry = entry.unwrap();
             let p = match entry.path().strip_prefix(&dir.path) {
-                Ok(p) if cfg!(windows) => base.join(p).to_string_lossy().replace('\\', "/"),
+                Ok(p) if cfg!(windows) => base.join(p).to_string_lossy().replace("\\", "/"),
                 Ok(p) => base.join(p).to_string_lossy().into_owned(),
                 Err(_) => continue,
             };

actix-files/src/error.rs

@@ -2,47 +2,41 @@ use actix_web::{http::StatusCode, ResponseError};
 use derive_more::Display;
 
 /// Errors which can occur when serving static files.
-#[derive(Debug, PartialEq, Eq, Display)]
+#[derive(Display, Debug, PartialEq)]
 pub enum FilesError {
-    /// Path is not a directory.
+    /// Path is not a directory
     #[allow(dead_code)]
-    #[display("path is not a directory. Unable to serve static files")]
+    #[display(fmt = "Path is not a directory. Unable to serve static files")]
     IsNotDirectory,
 
-    /// Cannot render directory.
+    /// Cannot render directory
-    #[display("unable to render directory without index file")]
+    #[display(fmt = "Unable to render directory without index file")]
     IsDirectory,
 }
 
+/// Return `NotFound` for `FilesError`
 impl ResponseError for FilesError {
-    /// Returns `404 Not Found`.
     fn status_code(&self) -> StatusCode {
         StatusCode::NOT_FOUND
     }
 }
 
-#[derive(Debug, PartialEq, Eq, Display)]
+#[allow(clippy::enum_variant_names)]
-#[non_exhaustive]
+#[derive(Display, Debug, PartialEq)]
 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),
-
+    /// The segment contained the wrapped invalid character.
-    /// Segment contained the wrapped invalid character.
+    #[display(fmt = "The segment contained the wrapped invalid character")]
-    #[display("segment contained invalid character ('{_0}')")]
     BadChar(char),
-
+    /// The segment ended with the wrapped invalid character.
-    /// Segment ended with the wrapped invalid character.
+    #[display(fmt = "The segment ended with the wrapped invalid character")]
-    #[display("segment ended with invalid character: ('{_0}')")]
     BadEnd(char),
-
-    /// Path is not a valid UTF-8 string after percent-decoding.
-    #[display("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,
@@ -27,7 +28,6 @@ use crate::{
 ///
 /// `Files` service must be registered with `App::service()` method.
 ///
-/// # Examples
 /// ```
 /// use actix_web::App;
 /// use actix_files::Files;
@@ -36,7 +36,7 @@ use crate::{
 ///     .service(Files::new("/static", "."));
 /// ```
 pub struct Files {
-    mount_path: String,
+    path: String,
     directory: PathBuf,
     index: Option<String>,
     show_index: bool,
@@ -67,7 +67,7 @@ impl Clone for Files {
             default: self.default.clone(),
             renderer: self.renderer.clone(),
             file_flags: self.file_flags,
-            mount_path: self.mount_path.clone(),
+            path: self.path.clone(),
             mime_override: self.mime_override.clone(),
             path_filter: self.path_filter.clone(),
             use_guards: self.use_guards.clone(),
@@ -106,7 +106,7 @@ impl Files {
         };
 
         Files {
-            mount_path: mount_path.trim_end_matches('/').to_owned(),
+            path: mount_path.trim_end_matches('/').to_owned(),
             directory: dir,
             index: None,
             show_index: false,
@@ -141,7 +141,7 @@ impl Files {
         self
     }
 
-    /// Set custom directory renderer.
+    /// Set custom directory renderer
     pub fn files_listing_renderer<F>(mut self, f: F) -> Self
     where
         for<'r, 's> F:
@@ -151,7 +151,7 @@ impl Files {
         self
     }
 
-    /// Specifies MIME override callback.
+    /// Specifies mime override callback
     pub fn mime_override<F>(mut self, f: F) -> Self
     where
         F: Fn(&mime::Name<'_>) -> DispositionType + 'static,
@@ -235,7 +235,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
     /// ```
@@ -262,9 +262,9 @@ impl Files {
         self
     }
 
-    /// See [`Files::method_guard`].
     #[doc(hidden)]
     #[deprecated(since = "0.6.0", note = "Renamed to `method_guard`.")]
+    /// See [`Files::method_guard`].
     pub fn use_guards<G: Guard + 'static>(self, guard: G) -> Self {
         self.method_guard(guard)
     }
@@ -300,8 +300,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(
@@ -337,9 +341,9 @@ impl HttpServiceFactory for Files {
         }
 
         let rdef = if config.is_root() {
-            ResourceDef::root_prefix(&self.mount_path)
+            ResourceDef::root_prefix(&self.path)
         } else {
-            ResourceDef::prefix(&self.mount_path)
+            ResourceDef::prefix(&self.path)
         };
 
         config.register_service(rdef, guards, self, None)
@@ -385,46 +389,3 @@ impl ServiceFactory<ServiceRequest> for Files {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use actix_web::{
-        http::StatusCode,
-        test::{self, TestRequest},
-        App, HttpResponse,
-    };
-
-    use super::*;
-
-    #[actix_web::test]
-    async fn custom_files_listing_renderer() {
-        let srv = test::init_service(
-            App::new().service(
-                Files::new("/", "./tests")
-                    .show_files_listing()
-                    .files_listing_renderer(|dir, req| {
-                        Ok(ServiceResponse::new(
-                            req.clone(),
-                            HttpResponse::Ok().body(dir.path.to_str().unwrap().to_owned()),
-                        ))
-                    }),
-            ),
-        )
-        .await;
-
-        let req = TestRequest::with_uri("/").to_request();
-        let res = test::call_service(&srv, req).await;
-
-        assert_eq!(res.status(), StatusCode::OK);
-        let body = test::read_body(res).await;
-        let body_str = std::str::from_utf8(&body).unwrap();
-        let actual_path = Path::new(&body_str);
-        let expected_path = Path::new("actix-files/tests");
-        assert!(
-            actual_path.ends_with(expected_path),
-            "body {:?} does not end with {:?}",
-            actual_path,
-            expected_path
-        );
-    }
-}

actix-files/src/lib.rs

@@ -2,7 +2,7 @@
 //!
 //! Provides a non-blocking service for serving static files from disk.
 //!
-//! # Examples
+//! # Example
 //! ```
 //! use actix_web::App;
 //! use actix_files::Files;
@@ -11,12 +11,8 @@
 //!     .service(Files::new("/static", ".").prefer_utf8(true));
 //! ```
 
+#![deny(rust_2018_idioms)]
 #![warn(missing_docs, missing_debug_implementations)]
-#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
-#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_auto_cfg))]
-
-use std::path::Path;
 
 use actix_service::boxed::{BoxService, BoxServiceFactory};
 use actix_web::{
@@ -25,6 +21,7 @@ use actix_web::{
     http::header::DispositionType,
 };
 use mime_guess::from_ext;
+use std::path::Path;
 
 mod chunked;
 mod directory;
@@ -36,15 +33,16 @@ mod path_buf;
 mod range;
 mod service;
 
-pub use self::{
+pub use self::chunked::ChunkedReadFile;
-    chunked::ChunkedReadFile, directory::Directory, files::Files, named::NamedFile,
+pub use self::directory::Directory;
-    range::HttpRange, service::FilesService,
+pub use self::files::Files;
-};
+pub use self::named::NamedFile;
-use self::{
+pub use self::range::HttpRange;
-    directory::{directory_listing, DirectoryRenderer},
+pub use self::service::FilesService;
-    error::FilesError,
+
-    path_buf::PathBufWrap,
+use self::directory::{directory_listing, DirectoryRenderer};
-};
+use self::error::FilesError;
+use self::path_buf::PathBufWrap;
 
 type HttpService = BoxService<ServiceRequest, ServiceResponse, Error>;
 type HttpNewService = BoxServiceFactory<(), ServiceRequest, ServiceResponse, Error, ()>;
@@ -64,17 +62,16 @@ type PathFilter = dyn Fn(&Path, &RequestHead) -> bool;
 #[cfg(test)]
 mod tests {
     use std::{
-        fmt::Write as _,
         fs::{self},
         ops::Add,
         time::{Duration, SystemTime},
     };
 
+    use actix_service::ServiceFactory;
     use actix_web::{
-        dev::ServiceFactory,
         guard,
         http::{
-            header::{self, ContentDisposition, DispositionParam},
+            header::{self, ContentDisposition, DispositionParam, DispositionType},
             Method, StatusCode,
         },
         middleware::Compress,
@@ -109,7 +106,7 @@ mod tests {
         let req = TestRequest::default()
             .insert_header((header::IF_MODIFIED_SINCE, since))
             .to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(resp.status(), StatusCode::NOT_MODIFIED);
     }
 
@@ -121,7 +118,7 @@ mod tests {
         let req = TestRequest::default()
             .insert_header((header::IF_MODIFIED_SINCE, since))
             .to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(resp.status(), StatusCode::NOT_MODIFIED);
     }
 
@@ -134,7 +131,7 @@ mod tests {
             .insert_header((header::IF_NONE_MATCH, "miss_etag"))
             .insert_header((header::IF_MODIFIED_SINCE, since))
             .to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_ne!(resp.status(), StatusCode::NOT_MODIFIED);
     }
 
@@ -146,7 +143,7 @@ mod tests {
         let req = TestRequest::default()
             .insert_header((header::IF_UNMODIFIED_SINCE, since))
             .to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(resp.status(), StatusCode::OK);
     }
 
@@ -158,7 +155,7 @@ mod tests {
         let req = TestRequest::default()
             .insert_header((header::IF_UNMODIFIED_SINCE, since))
             .to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(resp.status(), StatusCode::PRECONDITION_FAILED);
     }
 
@@ -175,7 +172,7 @@ mod tests {
         }
 
         let req = TestRequest::default().to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(
             resp.headers().get(header::CONTENT_TYPE).unwrap(),
             "text/x-toml"
@@ -199,7 +196,7 @@ mod tests {
         }
 
         let req = TestRequest::default().to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(
             resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
             "inline; filename=\"Cargo.toml\""
@@ -210,7 +207,7 @@ mod tests {
             .unwrap()
             .disable_content_disposition();
         let req = TestRequest::default().to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert!(resp.headers().get(header::CONTENT_DISPOSITION).is_none());
     }
 
@@ -238,7 +235,7 @@ mod tests {
         }
 
         let req = TestRequest::default().to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(
             resp.headers().get(header::CONTENT_TYPE).unwrap(),
             "text/x-toml"
@@ -264,7 +261,7 @@ mod tests {
         }
 
         let req = TestRequest::default().to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(
             resp.headers().get(header::CONTENT_TYPE).unwrap(),
             "text/xml"
@@ -287,7 +284,7 @@ mod tests {
         }
 
         let req = TestRequest::default().to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(
             resp.headers().get(header::CONTENT_TYPE).unwrap(),
             "image/png"
@@ -303,14 +300,14 @@ mod tests {
         let file = NamedFile::open_async("tests/test.js").await.unwrap();
 
         let req = TestRequest::default().to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(
             resp.headers().get(header::CONTENT_TYPE).unwrap(),
-            "text/javascript",
+            "application/javascript"
         );
         assert_eq!(
             resp.headers().get(header::CONTENT_DISPOSITION).unwrap(),
-            "inline; filename=\"test.js\"",
+            "inline; filename=\"test.js\""
         );
     }
 
@@ -333,7 +330,7 @@ mod tests {
         }
 
         let req = TestRequest::default().to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(
             resp.headers().get(header::CONTENT_TYPE).unwrap(),
             "image/png"
@@ -356,7 +353,7 @@ mod tests {
         }
 
         let req = TestRequest::default().to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(
             resp.headers().get(header::CONTENT_TYPE).unwrap(),
             "application/octet-stream"
@@ -367,45 +364,22 @@ mod tests {
         );
     }
 
-    #[allow(deprecated)]
     #[actix_rt::test]
-    async fn status_code_customize_same_output() {
+    async fn test_named_file_status_code_text() {
-        let file1 = NamedFile::open_async("Cargo.toml")
+        let mut file = NamedFile::open_async("Cargo.toml")
             .await
             .unwrap()
             .set_status_code(StatusCode::NOT_FOUND);
-
-        let file2 = NamedFile::open_async("Cargo.toml")
-            .await
-            .unwrap()
-            .customize()
-            .with_status(StatusCode::NOT_FOUND);
-
-        let req = TestRequest::default().to_http_request();
-        let res1 = file1.respond_to(&req);
-        let res2 = file2.respond_to(&req);
-
-        assert_eq!(res1.status(), StatusCode::NOT_FOUND);
-        assert_eq!(res2.status(), StatusCode::NOT_FOUND);
-    }
-
-    #[actix_rt::test]
-    async fn test_named_file_status_code_text() {
-        let mut file = NamedFile::open_async("Cargo.toml").await.unwrap();
-
         {
             file.file();
             let _f: &File = &file;
         }
-
         {
             let _f: &mut File = &mut file;
         }
 
-        let file = file.customize().with_status(StatusCode::NOT_FOUND);
-
         let req = TestRequest::default().to_http_request();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(
             resp.headers().get(header::CONTENT_TYPE).unwrap(),
             "text/x-toml"
@@ -553,8 +527,9 @@ 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;
         let request = TestRequest::get()
             .uri("/tests/test%20space.binary")
@@ -567,30 +542,6 @@ mod tests {
         assert_eq!(bytes, data);
     }
 
-    #[cfg(not(target_os = "windows"))]
-    #[actix_rt::test]
-    async fn test_static_files_with_special_characters() {
-        // Create the file we want to test against ad-hoc. We can't check it in as otherwise
-        // Windows can't even checkout this repository.
-        let temp_dir = tempfile::tempdir().unwrap();
-        let file_with_newlines = temp_dir.path().join("test\n\x0B\x0C\rnewline.text");
-        fs::write(&file_with_newlines, "Look at my newlines").unwrap();
-
-        let srv = test::init_service(
-            App::new().service(Files::new("/", temp_dir.path()).index_file("Cargo.toml")),
-        )
-        .await;
-        let request = TestRequest::get()
-            .uri("/test%0A%0B%0C%0Dnewline.text")
-            .to_request();
-        let response = test::call_service(&srv, request).await;
-        assert_eq!(response.status(), StatusCode::OK);
-
-        let bytes = test::read_body(response).await;
-        let data = web::Bytes::from(fs::read(file_with_newlines).unwrap());
-        assert_eq!(bytes, data);
-    }
-
     #[actix_rt::test]
     async fn test_files_not_allowed() {
         let srv = test::init_service(App::new().service(Files::new("/", "."))).await;
@@ -646,8 +597,7 @@ mod tests {
             .to_request();
         let res = test::call_service(&srv, request).await;
         assert_eq!(res.status(), StatusCode::OK);
-        assert!(res.headers().contains_key(header::CONTENT_ENCODING));
+        assert!(!res.headers().contains_key(header::CONTENT_ENCODING));
-        assert!(!test::read_body(res).await.is_empty());
     }
 
     #[actix_rt::test]
@@ -682,14 +632,15 @@ mod tests {
     async fn test_named_file_allowed_method() {
         let req = TestRequest::default().method(Method::GET).to_http_request();
         let file = NamedFile::open_async("Cargo.toml").await.unwrap();
-        let resp = file.respond_to(&req);
+        let resp = file.respond_to(&req).await.unwrap();
         assert_eq!(resp.status(), StatusCode::OK);
     }
 
     #[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 +653,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!(
@@ -850,40 +802,6 @@ mod tests {
         let req = TestRequest::get().uri("/test/%43argo.toml").to_request();
         let res = test::call_service(&srv, req).await;
         assert_eq!(res.status(), StatusCode::OK);
-
-        // `%2F` == `/`
-        let req = TestRequest::get().uri("/test%2Ftest.binary").to_request();
-        let res = test::call_service(&srv, req).await;
-        assert_eq!(res.status(), StatusCode::NOT_FOUND);
-
-        let req = TestRequest::get().uri("/test/Cargo.toml%00").to_request();
-        let res = test::call_service(&srv, req).await;
-        assert_eq!(res.status(), StatusCode::NOT_FOUND);
-    }
-
-    #[actix_rt::test]
-    async fn test_percent_encoding_2() {
-        let temp_dir = tempfile::tempdir().unwrap();
-        let filename = match cfg!(unix) {
-            true => "ض:?#[]{}<>()@!$&'`|*+,;= %20\n.test",
-            false => "ض#[]{}()@!$&'`+,;= %20.test",
-        };
-        let filename_encoded = filename
-            .as_bytes()
-            .iter()
-            .fold(String::new(), |mut buf, c| {
-                write!(&mut buf, "%{:02X}", c).unwrap();
-                buf
-            });
-        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 req = TestRequest::get()
-            .uri(&format!("/{}", filename_encoded))
-            .to_request();
-        let res = test::call_service(&srv, req).await;
-        assert_eq!(res.status(), StatusCode::OK);
     }
 
     #[actix_rt::test]

actix-files/src/named.rs

@@ -1,34 +1,37 @@
 use std::{
+    fmt,
     fs::Metadata,
     io,
+    ops::{Deref, DerefMut},
     path::{Path, PathBuf},
     time::{SystemTime, UNIX_EPOCH},
 };
 
+#[cfg(unix)]
+use std::os::unix::fs::MetadataExt;
+
+use actix_http::body::AnyBody;
+use actix_service::{Service, ServiceFactory};
 use actix_web::{
-    body::{self, BoxBody, SizedStream},
     dev::{
-        self, AppService, HttpServiceFactory, ResourceDef, Service, ServiceFactory, ServiceRequest,
+        AppService, BodyEncoding, HttpServiceFactory, ResourceDef, ServiceRequest,
-        ServiceResponse,
+        ServiceResponse, SizedStream,
     },
     http::{
         header::{
-            self, Charset, ContentDisposition, ContentEncoding, DispositionParam, DispositionType,
+            self, Charset, ContentDisposition, DispositionParam, DispositionType, ExtendedValue,
-            ExtendedValue, HeaderValue,
         },
-        StatusCode,
+        ContentEncoding, StatusCode,
     },
     Error, HttpMessage, HttpRequest, HttpResponse, Responder,
 };
 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;
@@ -39,7 +42,7 @@ bitflags! {
 
 impl Default for Flags {
     fn default() -> Self {
-        Flags::from_bits_truncate(0b0000_1111)
+        Flags::from_bits_truncate(0b0000_0111)
     }
 }
 
@@ -67,29 +70,49 @@ impl Default for Flags {
 ///     NamedFile::open_async("./static/index.html").await
 /// }
 /// ```
-#[derive(Debug, Deref, DerefMut)]
 pub struct NamedFile {
-    #[deref]
-    #[deref_mut]
-    file: File,
     path: PathBuf,
+    file: File,
     modified: Option<SystemTime>,
     pub(crate) md: Metadata,
     pub(crate) flags: Flags,
     pub(crate) status_code: StatusCode,
-    pub(crate) content_type: Mime,
+    pub(crate) content_type: mime::Mime,
-    pub(crate) content_disposition: ContentDisposition,
+    pub(crate) content_disposition: header::ContentDisposition,
     pub(crate) encoding: Option<ContentEncoding>,
 }
 
+impl fmt::Debug for NamedFile {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("NamedFile")
+            .field("path", &self.path)
+            .field(
+                "file",
+                #[cfg(feature = "experimental-io-uring")]
+                {
+                    &"tokio_uring::File"
+                },
+                #[cfg(not(feature = "experimental-io-uring"))]
+                {
+                    &self.file
+                },
+            )
+            .field("modified", &self.modified)
+            .field("md", &self.md)
+            .field("flags", &self.flags)
+            .field("status_code", &self.status_code)
+            .field("content_type", &self.content_type)
+            .field("content_disposition", &self.content_disposition)
+            .field("encoding", &self.encoding)
+            .finish()
+    }
+}
+
 #[cfg(not(feature = "experimental-io-uring"))]
 pub(crate) use std::fs::File;
-
 #[cfg(feature = "experimental-io-uring")]
 pub(crate) use tokio_uring::fs::File;
 
-use super::chunked;
-
 impl NamedFile {
     /// Creates an instance from a previously opened file.
     ///
@@ -98,18 +121,18 @@ impl NamedFile {
     ///
     /// # Examples
     /// ```ignore
-    /// use std::{
-    ///     io::{self, Write as _},
-    ///     env,
-    ///     fs::File
-    /// };
     /// use actix_files::NamedFile;
+    /// use std::io::{self, Write};
+    /// use std::env;
+    /// use std::fs::File;
     ///
+    /// fn main() -> io::Result<()> {
     ///     let mut file = File::create("foo.txt")?;
     ///     file.write_all(b"Hello, world!")?;
     ///     let named_file = NamedFile::from_file(file, "bar.txt")?;
     ///     # std::fs::remove_file("foo.txt");
     ///     Ok(())
+    /// }
     /// ```
     pub fn from_file<P: AsRef<Path>>(file: File, path: P) -> io::Result<NamedFile> {
         let path = path.as_ref().to_path_buf();
@@ -127,25 +150,20 @@ impl NamedFile {
                 }
             };
 
-            let ct = mime_guess::from_path(&path).first_or_octet_stream();
+            let ct = from_path(&path).first_or_octet_stream();
 
             let disposition = match ct.type_() {
-                mime::IMAGE | mime::TEXT | mime::AUDIO | mime::VIDEO => DispositionType::Inline,
+                mime::IMAGE | mime::TEXT | mime::VIDEO => DispositionType::Inline,
                 mime::APPLICATION => match ct.subtype() {
                     mime::JAVASCRIPT | mime::JSON => DispositionType::Inline,
-                    name if name == "wasm" || name == "xhtml" => DispositionType::Inline,
+                    name if name == "wasm" => DispositionType::Inline,
                     _ => DispositionType::Attachment,
                 },
                 _ => DispositionType::Attachment,
             };
 
-            // replace special characters in filenames which could occur on some filesystems
+            let mut parameters =
-            let filename_s = filename
+                vec![DispositionParam::Filename(String::from(filename.as_ref()))];
-                .replace('\n', "%0A") // \n line break
-                .replace('\x0B', "%0B") // \v vertical tab
-                .replace('\x0C', "%0C") // \f form feed
-                .replace('\r', "%0D"); // \r carriage return
-            let mut parameters = vec![DispositionParam::Filename(filename_s)];
 
             if !filename.is_ascii() {
                 parameters.push(DispositionParam::FilenameExt(ExtendedValue {
@@ -203,6 +221,7 @@ impl NamedFile {
         })
     }
 
+    #[cfg(not(feature = "experimental-io-uring"))]
     /// Attempts to open a file in read-only mode.
     ///
     /// # Examples
@@ -210,7 +229,6 @@ impl NamedFile {
     /// use actix_files::NamedFile;
     /// let file = NamedFile::open("foo.txt");
     /// ```
-    #[cfg(not(feature = "experimental-io-uring"))]
     pub fn open<P: AsRef<Path>>(path: P) -> io::Result<NamedFile> {
         let file = File::open(&path)?;
         Self::from_file(file, path)
@@ -218,8 +236,8 @@ impl NamedFile {
 
     /// Attempts to open a file asynchronously in read-only mode.
     ///
-    /// When the `experimental-io-uring` crate feature is enabled, this will be async. Otherwise, it
+    /// When the `experimental-io-uring` crate feature is enabled, this will be async.
-    /// will behave just like `open`.
+    /// Otherwise, it will be just like [`open`][Self::open].
     ///
     /// # Examples
     /// ```
@@ -244,13 +262,13 @@ impl NamedFile {
         Self::from_file(file, path)
     }
 
-    /// Returns reference to the underlying file object.
+    /// Returns reference to the underlying `File` object.
     #[inline]
     pub fn file(&self) -> &File {
         &self.file
     }
 
-    /// Returns the filesystem path to this file.
+    /// Retrieve the path of this file.
     ///
     /// # Examples
     /// ```
@@ -268,92 +286,55 @@ impl NamedFile {
         self.path.as_path()
     }
 
-    /// Returns the time the file was last modified.
+    /// Set response **Status Code**
-    ///
-    /// Returns `None` only on unsupported platforms; see [`std::fs::Metadata::modified()`].
-    /// Therefore, it is usually safe to unwrap this.
-    #[inline]
-    pub fn modified(&self) -> Option<SystemTime> {
-        self.modified
-    }
-
-    /// Returns the filesystem metadata associated with this file.
-    #[inline]
-    pub fn metadata(&self) -> &Metadata {
-        &self.md
-    }
-
-    /// Returns the `Content-Type` header that will be used when serving this file.
-    #[inline]
-    pub fn content_type(&self) -> &Mime {
-        &self.content_type
-    }
-
-    /// Returns the `Content-Disposition` that will be used when serving this file.
-    #[inline]
-    pub fn content_disposition(&self) -> &ContentDisposition {
-        &self.content_disposition
-    }
-
-    /// Returns the `Content-Encoding` that will be used when serving this file.
-    ///
-    /// A return value of `None` indicates that the content is not already using a compressed
-    /// representation and may be subject to compression downstream.
-    #[inline]
-    pub fn content_encoding(&self) -> Option<ContentEncoding> {
-        self.encoding
-    }
-
-    /// Set response status code.
-    #[deprecated(since = "0.7.0", note = "Prefer `Responder::customize()`.")]
     pub fn set_status_code(mut self, status: StatusCode) -> Self {
         self.status_code = status;
         self
     }
 
-    /// Sets the `Content-Type` header that will be used when serving this file. By default the
+    /// Set the MIME Content-Type for serving this file. By default
-    /// `Content-Type` is inferred from the filename extension.
+    /// the Content-Type is inferred from the filename extension.
     #[inline]
-    pub fn set_content_type(mut self, mime_type: Mime) -> Self {
+    pub fn set_content_type(mut self, mime_type: mime::Mime) -> Self {
         self.content_type = mime_type;
         self
     }
 
-    /// Set the Content-Disposition for serving this file. This allows changing the
+    /// Set the Content-Disposition for serving this file. This allows
-    /// `inline/attachment` disposition as well as the filename sent to the peer.
+    /// changing the inline/attachment disposition as well as the filename
+    /// sent to the peer.
     ///
     /// By default the disposition is `inline` for `text/*`, `image/*`, `video/*` and
-    /// `application/{javascript, json, wasm}` mime types, and `attachment` otherwise, and the
+    /// `application/{javascript, json, wasm}` mime types, and `attachment` otherwise,
-    /// filename is taken from the path provided in the `open` method after converting it to UTF-8
+    /// and the filename is taken from the path provided in the `open` method
-    /// (using `to_string_lossy`).
+    /// after converting it to UTF-8 using.
+    /// [`std::ffi::OsStr::to_string_lossy`]
     #[inline]
-    pub fn set_content_disposition(mut self, cd: ContentDisposition) -> Self {
+    pub fn set_content_disposition(mut self, cd: header::ContentDisposition) -> Self {
         self.content_disposition = cd;
         self.flags.insert(Flags::CONTENT_DISPOSITION);
         self
     }
 
-    /// Disables `Content-Disposition` header.
+    /// Disable `Content-Disposition` header.
     ///
-    /// By default, the `Content-Disposition` header is sent.
+    /// By default Content-Disposition` header is enabled.
     #[inline]
     pub fn disable_content_disposition(mut self) -> Self {
         self.flags.remove(Flags::CONTENT_DISPOSITION);
         self
     }
 
-    /// Sets content encoding for this file.
+    /// Set content encoding for serving this file
     ///
-    /// This prevents the `Compress` middleware from modifying the file contents and signals to
+    /// Must be used with [`actix_web::middleware::Compress`] to take effect.
-    /// browsers/clients how to decode it. For example, if serving a compressed HTML file (e.g.,
-    /// `index.html.gz`) then use `.set_content_encoding(ContentEncoding::Gzip)`.
     #[inline]
     pub fn set_content_encoding(mut self, enc: ContentEncoding) -> Self {
         self.encoding = Some(enc);
         self
     }
 
-    /// Specifies whether to return `ETag` header in response.
+    /// Specifies whether to use ETag or not.
     ///
     /// Default is true.
     #[inline]
@@ -362,7 +343,7 @@ impl NamedFile {
         self
     }
 
-    /// Specifies whether to return `Last-Modified` header in response.
+    /// Specifies whether to use Last-Modified or not.
     ///
     /// Default is true.
     #[inline]
@@ -380,18 +361,14 @@ impl NamedFile {
         self
     }
 
-    /// Creates an `ETag` in a format is similar to Apache's.
     pub(crate) fn etag(&self) -> Option<header::EntityTag> {
+        // This etag format is similar to Apache's.
         self.modified.as_ref().map(|mtime| {
             let ino = {
                 #[cfg(unix)]
                 {
-                    #[cfg(unix)]
-                    use std::os::unix::fs::MetadataExt as _;
-
                     self.md.ino()
                 }
-
                 #[cfg(not(unix))]
                 {
                     0
@@ -402,7 +379,7 @@ impl NamedFile {
                 .duration_since(UNIX_EPOCH)
                 .expect("modification time must be after epoch");
 
-            header::EntityTag::new_strong(format!(
+            header::EntityTag::strong(format!(
                 "{:x}:{:x}:{:x}:{:x}",
                 ino,
                 self.md.len(),
@@ -417,17 +394,16 @@ impl NamedFile {
     }
 
     /// Creates an `HttpResponse` with file as a streaming body.
-    pub fn into_response(self, req: &HttpRequest) -> HttpResponse<BoxBody> {
+    pub fn into_response(self, req: &HttpRequest) -> HttpResponse {
         if self.status_code != StatusCode::OK {
             let mut res = HttpResponse::build(self.status_code);
 
-            let ct = if self.flags.contains(Flags::PREFER_UTF8) {
+            if self.flags.contains(Flags::PREFER_UTF8) {
-                equiv_utf8_text(self.content_type.clone())
+                let ct = equiv_utf8_text(self.content_type.clone());
-            } else {
-                self.content_type
-            };
-
                 res.insert_header((header::CONTENT_TYPE, ct.to_string()));
+            } else {
+                res.insert_header((header::CONTENT_TYPE, self.content_type.to_string()));
+            }
 
             if self.flags.contains(Flags::CONTENT_DISPOSITION) {
                 res.insert_header((
@@ -437,10 +413,10 @@ impl NamedFile {
             }
 
             if let Some(current_encoding) = self.encoding {
-                res.insert_header((header::CONTENT_ENCODING, current_encoding.as_str()));
+                res.encoding(current_encoding);
             }
 
-            let reader = chunked::new_chunked_read(self.md.len(), 0, self.file);
+            let reader = super::chunked::new_chunked_read(self.md.len(), 0, self.file);
 
             return res.streaming(reader);
         }
@@ -493,36 +469,36 @@ impl NamedFile {
             false
         };
 
-        let mut res = HttpResponse::build(self.status_code);
+        let mut resp = HttpResponse::build(self.status_code);
 
-        let ct = if self.flags.contains(Flags::PREFER_UTF8) {
+        if self.flags.contains(Flags::PREFER_UTF8) {
-            equiv_utf8_text(self.content_type.clone())
+            let ct = equiv_utf8_text(self.content_type.clone());
+            resp.insert_header((header::CONTENT_TYPE, ct.to_string()));
         } else {
-            self.content_type
+            resp.insert_header((header::CONTENT_TYPE, self.content_type.to_string()));
-        };
+        }
-
-        res.insert_header((header::CONTENT_TYPE, ct.to_string()));
 
         if self.flags.contains(Flags::CONTENT_DISPOSITION) {
-            res.insert_header((
+            resp.insert_header((
                 header::CONTENT_DISPOSITION,
                 self.content_disposition.to_string(),
             ));
         }
 
+        // default compressing
         if let Some(current_encoding) = self.encoding {
-            res.insert_header((header::CONTENT_ENCODING, current_encoding.as_str()));
+            resp.encoding(current_encoding);
         }
 
         if let Some(lm) = last_modified {
-            res.insert_header((header::LAST_MODIFIED, lm.to_string()));
+            resp.insert_header((header::LAST_MODIFIED, lm.to_string()));
         }
 
         if let Some(etag) = etag {
-            res.insert_header((header::ETAG, etag.to_string()));
+            resp.insert_header((header::ETAG, etag.to_string()));
         }
 
-        res.insert_header((header::ACCEPT_RANGES, "bytes"));
+        resp.insert_header((header::ACCEPT_RANGES, "bytes"));
 
         let mut length = self.md.len();
         let mut offset = 0;
@@ -534,56 +510,33 @@ impl NamedFile {
                     length = ranges[0].length;
                     offset = ranges[0].start;
 
-                    // When a Content-Encoding header is present in a 206 partial content response
+                    resp.encoding(ContentEncoding::Identity);
-                    // for video content, it prevents browser video players from starting playback
+                    resp.insert_header((
-                    // before loading the whole video and also prevents seeking.
-                    //
-                    // See: https://github.com/actix/actix-web/issues/2815
-                    //
-                    // The assumption of this fix is that the video player knows to not send an
-                    // Accept-Encoding header for this request and that downstream middleware will
-                    // not attempt compression for requests without it.
-                    //
-                    // TODO: Solve question around what to do if self.encoding is set and partial
-                    // range is requested. Reject request? Ignoring self.encoding seems wrong, too.
-                    // In practice, it should not come up.
-                    if req.headers().contains_key(&header::ACCEPT_ENCODING) {
-                        // don't allow compression middleware to modify partial content
-                        res.insert_header((
-                            header::CONTENT_ENCODING,
-                            HeaderValue::from_static("identity"),
-                        ));
-                    }
-
-                    res.insert_header((
                         header::CONTENT_RANGE,
                         format!("bytes {}-{}/{}", offset, offset + length - 1, self.md.len()),
                     ));
                 } else {
-                    res.insert_header((header::CONTENT_RANGE, format!("bytes */{}", length)));
+                    resp.insert_header((header::CONTENT_RANGE, format!("bytes */{}", length)));
-                    return res.status(StatusCode::RANGE_NOT_SATISFIABLE).finish();
+                    return resp.status(StatusCode::RANGE_NOT_SATISFIABLE).finish();
                 };
             } else {
-                return res.status(StatusCode::BAD_REQUEST).finish();
+                return resp.status(StatusCode::BAD_REQUEST).finish();
             };
         };
 
         if precondition_failed {
-            return res.status(StatusCode::PRECONDITION_FAILED).finish();
+            return resp.status(StatusCode::PRECONDITION_FAILED).finish();
         } else if not_modified {
-            return res
+            return resp.status(StatusCode::NOT_MODIFIED).body(AnyBody::None);
-                .status(StatusCode::NOT_MODIFIED)
-                .body(body::None::new())
-                .map_into_boxed_body();
         }
 
-        let reader = chunked::new_chunked_read(length, offset, self.file);
+        let reader = super::chunked::new_chunked_read(length, offset, self.file);
 
         if offset != 0 || length != self.md.len() {
-            res.status(StatusCode::PARTIAL_CONTENT);
+            resp.status(StatusCode::PARTIAL_CONTENT);
         }
 
-        res.body(SizedStream::new(length, reader))
+        resp.body(SizedStream::new(length, reader))
     }
 }
 
@@ -627,10 +580,22 @@ fn none_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool {
     }
 }
 
-impl Responder for NamedFile {
+impl Deref for NamedFile {
-    type Body = BoxBody;
+    type Target = File;
 
-    fn respond_to(self, req: &HttpRequest) -> HttpResponse<Self::Body> {
+    fn deref(&self) -> &Self::Target {
+        &self.file
+    }
+}
+
+impl DerefMut for NamedFile {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.file
+    }
+}
+
+impl Responder for NamedFile {
+    fn respond_to(self, req: &HttpRequest) -> HttpResponse {
         self.into_response(req)
     }
 }
@@ -663,7 +628,7 @@ impl Service<ServiceRequest> for NamedFileService {
     type Error = Error;
     type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
 
-    dev::always_ready!();
+    actix_service::always_ready!();
 
     fn call(&self, req: ServiceRequest) -> Self::Future {
         let (req, _) = req.into_parts();

actix-files/src/path_buf.rs

@@ -1,5 +1,5 @@
 use std::{
-    path::{Component, Path, PathBuf},
+    path::{Path, PathBuf},
     str::FromStr,
 };
 
@@ -26,23 +26,8 @@ impl PathBufWrap {
     pub fn parse_path(path: &str, hidden_files: bool) -> Result<Self, UriSegmentError> {
         let mut buf = PathBuf::new();
 
-        // equivalent to `path.split('/').count()`
-        let mut segment_count = path.matches('/').count() + 1;
-
-        // we can decode the whole path here (instead of per-segment decoding)
-        // because we will reject `%2F` in paths using `segment_count`.
-        let path = percent_encoding::percent_decode_str(path)
-            .decode_utf8()
-            .map_err(|_| UriSegmentError::NotValidUtf8)?;
-
-        // disallow decoding `%2F` into `/`
-        if segment_count != path.matches('/').count() + 1 {
-            return Err(UriSegmentError::BadChar('/'));
-        }
-
         for segment in path.split('/') {
             if segment == ".." {
-                segment_count -= 1;
                 buf.pop();
             } else if !hidden_files && segment.starts_with('.') {
                 return Err(UriSegmentError::BadStart('.'));
@@ -55,27 +40,14 @@ impl PathBufWrap {
             } else if segment.ends_with('<') {
                 return Err(UriSegmentError::BadEnd('<'));
             } else if segment.is_empty() {
-                segment_count -= 1;
                 continue;
             } else if cfg!(windows) && segment.contains('\\') {
                 return Err(UriSegmentError::BadChar('\\'));
-            } else if cfg!(windows) && segment.contains(':') {
-                return Err(UriSegmentError::BadChar(':'));
             } else {
                 buf.push(segment)
             }
         }
 
-        // make sure we agree with stdlib parser
-        for (i, component) in buf.components().enumerate() {
-            assert!(
-                matches!(component, Component::Normal(_)),
-                "component `{:?}` is not normal",
-                component
-            );
-            assert!(i < segment_count);
-        }
-
         Ok(PathBufWrap(buf))
     }
 }
@@ -91,12 +63,14 @@ impl FromRequest for PathBufWrap {
     type Future = Ready<Result<Self, Self::Error>>;
 
     fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
-        ready(req.match_info().unprocessed().parse())
+        ready(req.match_info().path().parse())
     }
 }
 
 #[cfg(test)]
 mod tests {
+    use std::iter::FromIterator;
+
     use super::*;
 
     #[test]
@@ -163,26 +137,4 @@ mod tests {
             PathBuf::from_iter(vec!["etc/passwd"])
         );
     }
-
-    #[test]
-    #[cfg_attr(windows, should_panic)]
-    fn windows_drive_traversal() {
-        // detect issues in windows that could lead to path traversal
-        // see <https://github.com/SergioBenitez/Rocket/issues/1949
-
-        assert_eq!(
-            PathBufWrap::parse_path("C:test.txt", false).unwrap().0,
-            PathBuf::from_iter(vec!["C:test.txt"])
-        );
-
-        assert_eq!(
-            PathBufWrap::parse_path("C:../whatever", false).unwrap().0,
-            PathBuf::from_iter(vec!["C:../whatever"])
-        );
-
-        assert_eq!(
-            PathBufWrap::parse_path(":test.txt", false).unwrap().0,
-            PathBuf::from_iter(vec![":test.txt"])
-        );
-    }
 }

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
-
-        Ok(ranges
                 .iter()
                 .map(|range| HttpRange {
                     start: range.start,
                     length: range.length,
                 })
-            .collect())
+                .collect()),
+            Err(_) => Err(ParseRangeErr(())),
+        }
     }
 }
 

actix-files/src/service.rs

@@ -1,8 +1,8 @@
 use std::{fmt, io, ops::Deref, path::PathBuf, rc::Rc};
 
+use actix_service::Service;
 use actix_web::{
-    body::BoxBody,
+    dev::{ServiceRequest, ServiceResponse},
-    dev::{self, Service, ServiceRequest, ServiceResponse},
     error::Error,
     guard::Guard,
     http::{header, Method},
@@ -23,7 +23,7 @@ impl Deref for FilesService {
     type Target = FilesServiceInner;
 
     fn deref(&self) -> &Self::Target {
-        &self.0
+        &*self.0
     }
 }
 
@@ -62,7 +62,11 @@ impl FilesService {
         }
     }
 
-    fn serve_named_file(&self, req: ServiceRequest, mut named_file: NamedFile) -> ServiceResponse {
+    fn serve_named_file(
+        &self,
+        req: ServiceRequest,
+        mut named_file: NamedFile,
+    ) -> ServiceResponse {
         if let Some(ref mime_override) = self.mime_override {
             let new_disposition = mime_override(&named_file.content_type.type_());
             named_file.content_disposition.disposition = new_disposition;
@@ -79,7 +83,7 @@ impl FilesService {
 
         let (req, _) = req.into_parts();
 
-        (self.renderer)(&dir, &req).unwrap_or_else(|err| ServiceResponse::from_err(err, req))
+        (self.renderer)(&dir, &req).unwrap_or_else(|e| ServiceResponse::from_err(e, req))
     }
 }
 
@@ -90,16 +94,16 @@ impl fmt::Debug for FilesService {
 }
 
 impl Service<ServiceRequest> for FilesService {
-    type Response = ServiceResponse<BoxBody>;
+    type Response = ServiceResponse;
     type Error = Error;
     type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
 
-    dev::always_ready!();
+    actix_service::always_ready!();
 
     fn call(&self, req: ServiceRequest) -> Self::Future {
         let is_method_valid = if let Some(guard) = &self.guards {
             // execute user defined guards
-            (**guard).check(&req.guard_ctx())
+            (**guard).check(req.head())
         } else {
             // default behavior
             matches!(*req.method(), Method::HEAD | Method::GET)
@@ -110,30 +114,32 @@ impl Service<ServiceRequest> for FilesService {
         Box::pin(async move {
             if !is_method_valid {
                 return Ok(req.into_response(
-                    HttpResponse::MethodNotAllowed()
+                    actix_web::HttpResponse::MethodNotAllowed()
                         .insert_header(header::ContentType(mime::TEXT_PLAIN_UTF_8))
                         .body("Request did not meet this resource's requirements."),
                 ));
             }
 
-            let path_on_disk =
+            let real_path =
-                match PathBufWrap::parse_path(req.match_info().unprocessed(), this.hidden_files) {
+                match PathBufWrap::parse_path(req.match_info().path(), this.hidden_files) {
                     Ok(item) => item,
-                    Err(err) => return Ok(req.error_response(err)),
+                    Err(e) => return Ok(req.error_response(e)),
                 };
 
             if let Some(filter) = &this.path_filter {
-                if !filter(path_on_disk.as_ref(), req.head()) {
+                if !filter(real_path.as_ref(), req.head()) {
                     if let Some(ref default) = this.default {
                         return default.call(req).await;
                     } else {
-                        return Ok(req.into_response(HttpResponse::NotFound().finish()));
+                        return Ok(
+                            req.into_response(actix_web::HttpResponse::NotFound().finish())
+                        );
                     }
                 }
             }
 
             // full file path
-            let path = this.directory.join(&path_on_disk);
+            let path = this.directory.join(&real_path);
             if let Err(err) = path.canonicalize() {
                 return this.handle_err(err, req).await;
             }
@@ -162,7 +168,7 @@ impl Service<ServiceRequest> for FilesService {
                         }
                     }
                     None if this.show_index => Ok(this.show_index(req, path)),
-                    None => Ok(ServiceResponse::from_err(
+                    _ => Ok(ServiceResponse::from_err(
                         FilesError::IsDirectory,
                         req.into_parts().0,
                     )),
@@ -171,7 +177,8 @@ impl Service<ServiceRequest> for FilesService {
                 match NamedFile::open_async(&path).await {
                     Ok(mut named_file) => {
                         if let Some(ref mime_override) = this.mime_override {
-                            let new_disposition = mime_override(&named_file.content_type.type_());
+                            let new_disposition =
+                                mime_override(&named_file.content_type.type_());
                             named_file.content_disposition.disposition = new_disposition;
                         }
                         named_file.flags = this.file_flags;

actix-files/tests/encoding.rs

@@ -1,11 +1,11 @@
-use actix_files::{Files, NamedFile};
+use actix_files::Files;
 use actix_web::{
     http::{
         header::{self, HeaderValue},
         StatusCode,
     },
     test::{self, TestRequest},
-    web, App,
+    App,
 };
 
 #[actix_web::test]
@@ -19,12 +19,13 @@ async fn test_utf8_file_contents() {
     assert_eq!(res.status(), StatusCode::OK);
     assert_eq!(
         res.headers().get(header::CONTENT_TYPE),
-        Some(&HeaderValue::from_static("text/plain; charset=utf-8")),
+        Some(&HeaderValue::from_static("text/plain")),
     );
 
-    // disable UTF-8 attribute
+    // prefer UTF-8 encoding
     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(true)))
+            .await;
 
     let req = TestRequest::with_uri("/utf8.txt").to_request();
     let res = test::call_service(&srv, req).await;
@@ -32,34 +33,6 @@ async fn test_utf8_file_contents() {
     assert_eq!(res.status(), StatusCode::OK);
     assert_eq!(
         res.headers().get(header::CONTENT_TYPE),
-        Some(&HeaderValue::from_static("text/plain")),
+        Some(&HeaderValue::from_static("text/plain; charset=utf-8")),
-    );
-}
-
-#[actix_web::test]
-async fn partial_range_response_encoding() {
-    let srv = test::init_service(App::new().default_service(web::to(|| async {
-        NamedFile::open_async("./tests/test.binary").await.unwrap()
-    })))
-    .await;
-
-    // range request without accept-encoding returns no content-encoding header
-    let req = TestRequest::with_uri("/")
-        .append_header((header::RANGE, "bytes=10-20"))
-        .to_request();
-    let res = test::call_service(&srv, req).await;
-    assert_eq!(res.status(), StatusCode::PARTIAL_CONTENT);
-    assert!(!res.headers().contains_key(header::CONTENT_ENCODING));
-
-    // range request with accept-encoding returns a content-encoding header
-    let req = TestRequest::with_uri("/")
-        .append_header((header::RANGE, "bytes=10-20"))
-        .append_header((header::ACCEPT_ENCODING, "identity"))
-        .to_request();
-    let res = test::call_service(&srv, req).await;
-    assert_eq!(res.status(), StatusCode::PARTIAL_CONTENT);
-    assert_eq!(
-        res.headers().get(header::CONTENT_ENCODING).unwrap(),
-        "identity"
     );
 }

actix-files/tests/guard.rs

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

actix-files/tests/traversal.rs

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

actix-http-test/CHANGES.md

@@ -1,175 +1,124 @@
 # Changes
 
-## Unreleased
+## Unreleased - 2021-xx-xx
 
-- Minimum supported Rust version (MSRV) is now 1.72.
 
-## 3.2.0
+## 3.0.0-beta.8 - 2021-11-30
-
+* Update `actix-tls` to `3.0.0-rc.1`. [#2474]
-- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
-
-## 3.1.0
-
-- Minimum supported Rust version (MSRV) is now 1.59.
-
-## 3.0.0
-
-- `TestServer::stop` is now async and will wait for the server and system to shutdown. [#2442]
-- Added `TestServer::client_headers` method. [#2097]
-- Update `actix-server` dependency to `2`.
-- Update `actix-tls` dependency to `3`.
-- Update `bytes` to `1.0`. [#1813]
-- Minimum supported Rust version (MSRV) is now 1.57.
-
-[#2442]: https://github.com/actix/actix-web/pull/2442
-[#2097]: https://github.com/actix/actix-web/pull/2097
-[#1813]: https://github.com/actix/actix-web/pull/1813
-
-<details>
-<summary>3.0.0 Pre-Releases</summary>
-
-## 3.0.0-beta.13
-
-- No significant changes since `3.0.0-beta.12`.
-
-## 3.0.0-beta.12
-
-- No significant changes since `3.0.0-beta.11`.
-
-## 3.0.0-beta.11
-
-- Minimum supported Rust version (MSRV) is now 1.54.
-
-## 3.0.0-beta.10
-
-- Update `actix-server` to `2.0.0-rc.2`. [#2550]
-
-[#2550]: https://github.com/actix/actix-web/pull/2550
-
-## 3.0.0-beta.9
-
-- No significant changes since `3.0.0-beta.8`.
-
-## 3.0.0-beta.8
-
-- Update `actix-tls` to `3.0.0-rc.1`. [#2474]
 
 [#2474]: https://github.com/actix/actix-web/pull/2474
 
-## 3.0.0-beta.7
 
-- Fix compatibility with experimental `io-uring` feature of `actix-rt`. [#2408]
+## 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
 
-- `TestServer::stop` is now async and will wait for the server and system to shutdown. [#2442]
+## 3.0.0-beta.6 - 2021-11-15
-- Update `actix-server` to `2.0.0-beta.9`. [#2442]
+* `TestServer::stop` is now async and will wait for the server and system to shutdown. [#2442]
-- Minimum supported Rust version (MSRV) is now 1.52.
+* Update `actix-server` to `2.0.0-beta.9`. [#2442]
+* Minimum supported Rust version (MSRV) is now 1.52.
 
 [#2442]: https://github.com/actix/actix-web/pull/2442
 
-## 3.0.0-beta.5
 
-- Minimum supported Rust version (MSRV) is now 1.51.
+## 3.0.0-beta.5 - 2021-09-09
+* Minimum supported Rust version (MSRV) is now 1.51.
 
-## 3.0.0-beta.4
 
-- Added `TestServer::client_headers` method. [#2097]
+## 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
 
-- No notable changes.
+## 3.0.0-beta.3 - 2021-03-09
+* No notable changes.
 
-## 3.0.0-beta.2
 
-- No notable changes.
+## 3.0.0-beta.2 - 2021-02-10
+* No notable changes.
 
-## 3.0.0-beta.1
 
-- Update `bytes` to `1.0`. [#1813]
+## 3.0.0-beta.1 - 2021-01-07
+* Update `bytes` to `1.0`. [#1813]
 
 [#1813]: https://github.com/actix/actix-web/pull/1813
 
-</details>
 
-## 2.1.0
+## 2.1.0 - 2020-11-25
-
+* Add ability to set address for `TestServer`. [#1645]
-- Add ability to set address for `TestServer`. [#1645]
+* Upgrade `base64` to `0.13`.
-- Upgrade `base64` to `0.13`.
+* Upgrade `serde_urlencoded` to `0.7`. [#1773]
-- Upgrade `serde_urlencoded` to `0.7`. [#1773]
 
 [#1773]: https://github.com/actix/actix-web/pull/1773
 [#1645]: https://github.com/actix/actix-web/pull/1645
 
-## 2.0.0
 
-- Update actix-codec and actix-utils dependencies.
+## 2.0.0 - 2020-09-11
+* Update actix-codec and actix-utils dependencies.
 
-## 2.0.0-alpha.1
 
-- Update the `time` dependency to 0.2.7
+## 2.0.0-alpha.1 - 2020-05-23
-- Update `actix-connect` dependency to 2.0.0-alpha.2
+* Update the `time` dependency to 0.2.7
-- Make `test_server` `async` fn.
+* Update `actix-connect` dependency to 2.0.0-alpha.2
-- Bump minimum supported Rust version to 1.40
+* Make `test_server` `async` fn.
-- Replace deprecated `net2` crate with `socket2`
+* Bump minimum supported Rust version to 1.40
-- Update `base64` dependency to 0.12
+* Replace deprecated `net2` crate with `socket2`
-- Update `env_logger` dependency to 0.7
+* 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()`
 
-- Replaced `TestServer::start()` with `test_server()`
 
-## 1.0.0-alpha.3
+## 1.0.0-alpha.3 - 2019-12-07
+* Migrate to `std::future`
 
-- 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`
 
-- 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
 
-- Update actix-server to 0.6
 
-## 0.2.3
+## 0.2.3 - 2019-07-16
+* Add `delete`, `options`, `patch` methods to `TestServerRunner`
 
-- Add `delete`, `options`, `patch` methods to `TestServerRunner`
 
-## 0.2.2
+## 0.2.2 - 2019-06-16
+* Add .put() and .sput() methods
 
-- Add .put() and .sput() methods
 
-## 0.2.1
+## 0.2.1 - 2019-06-05
+* Add license files
 
-- Add license files
 
-## 0.2.0
+## 0.2.0 - 2019-05-12
+* Update awc and actix-http deps
 
-- Update awc and actix-http deps
 
-## 0.1.1
+## 0.1.1 - 2019-04-24
+* Always make new connection for http client
 
-- Always make new connection for http client
 
-## 0.1.0
+## 0.1.0 - 2019-04-16
+* No changes
 
-- No changes
 
-## 0.1.0-alpha.3
+## 0.1.0-alpha.3 - 2019-04-02
+* Request functions accept path #743
 
-- 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
 
-- 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
-- Initial impl

actix-http-test/Cargo.toml

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

actix-http-test/README.md

@@ -1,20 +1,17 @@
-# `actix-http-test`
+# actix-http-test
 
-<!-- prettier-ignore-start -->
+> Various helpers for Actix applications to use during testing.
 
 [![crates.io](https://img.shields.io/crates/v/actix-http-test?label=latest)](https://crates.io/crates/actix-http-test)
-[![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.2.0)](https://docs.rs/actix-http-test/3.2.0)
+[![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.0.0-beta.8)](https://docs.rs/actix-http-test/3.0.0-beta.8)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http-test)
 <br>
-[![Dependency Status](https://deps.rs/crate/actix-http-test/3.2.0/status.svg)](https://deps.rs/crate/actix-http-test/3.2.0)
+[![Dependency Status](https://deps.rs/crate/actix-http-test/3.0.0-beta.8/status.svg)](https://deps.rs/crate/actix-http-test/3.0.0-beta.8)
 [![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.52
-Various helpers for Actix applications to use during testing.
-
-<!-- cargo-rdme end -->

actix-http-test/src/lib.rs

@@ -1,8 +1,8 @@
 //! Various helpers for Actix applications to use during testing.
 
+#![deny(rust_2018_idioms)]
 #![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;
@@ -11,10 +11,9 @@ use std::{net, thread, time::Duration};
 
 use actix_codec::{AsyncRead, AsyncWrite, Framed};
 use actix_rt::{net::TcpStream, System};
-use actix_server::{Server, ServerServiceFactory};
+use actix_server::{Server, ServiceFactory};
 use awc::{
-    error::PayloadError, http::header::HeaderMap, ws, Client, ClientRequest, ClientResponse,
+    error::PayloadError, http::HeaderMap, ws, Client, ClientRequest, ClientResponse, Connector,
-    Connector,
 };
 use bytes::Bytes;
 use futures_core::stream::Stream;
@@ -28,39 +27,35 @@ 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 {
+pub async fn test_server<F: ServiceFactory<TcpStream>>(factory: F) -> TestServer {
     let tcp = net::TcpListener::bind("127.0.0.1:0").unwrap();
     test_server_with_addr(tcp, factory).await
 }
 
 /// Start [`test server`](test_server()) on an existing address binding.
-pub async fn test_server_with_addr<F: ServerServiceFactory<TcpStream>>(
+pub async fn test_server_with_addr<F: ServiceFactory<TcpStream>>(
     tcp: net::TcpListener,
     factory: F,
 ) -> TestServer {
@@ -90,7 +85,6 @@ pub async fn test_server_with_addr<F: ServerServiceFactory<TcpStream>>(
 
         // notify TestServer that server and system have shut down
         // all thread managed resources should be dropped at this point
-        #[allow(clippy::let_underscore_future)]
         let _ = thread_stop_tx.send(());
     });
 
@@ -106,12 +100,12 @@ 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))
                 .timeout(Duration::from_millis(30000))
-                .openssl(builder.build())
+                .ssl(builder.build())
         };
 
         #[cfg(not(feature = "openssl"))]
@@ -298,7 +292,6 @@ impl Drop for TestServer {
         // without needing to await anything
 
         // signal server to stop
-        #[allow(clippy::let_underscore_future)]
         let _ = self.server.stop(true);
 
         // signal system to stop

actix-http/Cargo.toml

@@ -1,188 +1,114 @@
 [package]
 name = "actix-http"
-version = "3.10.0"
+version = "3.0.0-beta.14"
-authors = [
+authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-    "Nikolay Kim <fafhrd91@gmail.com>",
+description = "HTTP primitives for the Actix ecosystem"
-    "Rob Ede <robjtede@icloud.com>",
-]
-description = "HTTP types and services for the Actix ecosystem"
 keywords = ["actix", "http", "framework", "async", "futures"]
 homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-web"
+repository = "https://github.com/actix/actix-web.git"
 categories = [
     "network-programming",
     "asynchronous",
     "web-programming::http-server",
     "web-programming::websocket",
 ]
-license.workspace = true
+license = "MIT OR Apache-2.0"
-edition.workspace = true
+edition = "2018"
-rust-version.workspace = true
 
 [package.metadata.docs.rs]
-rustdoc-args = ["--cfg", "docsrs"]
+# features that docs.rs will build with
-features = [
+features = ["openssl", "rustls", "compress-brotli", "compress-gzip", "compress-zstd"]
-    "http2",
-    "ws",
-    "openssl",
-    "rustls-0_20",
-    "rustls-0_21",
-    "rustls-0_22",
-    "rustls-0_23",
-    "compress-brotli",
-    "compress-gzip",
-    "compress-zstd",
-]
 
-[package.metadata.cargo_check_external_types]
+[lib]
-allowed_external_types = [
+name = "actix_http"
-    "actix_codec::*",
+path = "src/lib.rs"
-    "actix_service::*",
-    "actix_tls::*",
-    "actix_utils::*",
-    "bytes::*",
-    "bytestring::*",
-    "encoding_rs::*",
-    "futures_core::*",
-    "h2::*",
-    "http::*",
-    "httparse::*",
-    "language_tags::*",
-    "mime::*",
-    "openssl::*",
-    "rustls::*",
-    "tokio_util::*",
-    "tokio::*",
-]
 
 [features]
 default = []
 
-# HTTP/2 protocol support
+# openssl
-http2 = ["dep:h2"]
+openssl = ["actix-tls/accept", "actix-tls/openssl"]
 
-# WebSocket protocol implementation
+# rustls support
-ws = [
+rustls = ["actix-tls/accept", "actix-tls/rustls"]
-    "dep:local-channel",
-    "dep:base64",
-    "dep:rand",
-    "dep:sha1",
-]
 
-# TLS via OpenSSL
+# enable compression support
-openssl = ["__tls", "actix-tls/accept", "actix-tls/openssl"]
+compress-brotli = ["brotli2", "__compress"]
+compress-gzip = ["flate2", "__compress"]
+compress-zstd = ["zstd", "__compress"]
 
-# TLS via Rustls v0.20
+# Internal (PRIVATE!) features used to aid testing and cheking feature status.
-rustls = ["__tls", "rustls-0_20"]
+# Don't rely on these whatsoever. They may disappear at anytime.
-
-# 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-gzip   = ["__compress", "dep:flate2"]
-compress-zstd   = ["__compress", "dep:zstd"]
-
-# Internal (PRIVATE!) features used to aid testing and checking feature status.
-# Don't rely on these whatsoever. They are semver-exempt and may disappear at anytime.
 __compress = []
 
-# Internal (PRIVATE!) features used to aid checking feature status.
-# Don't rely on these whatsoever. They may disappear at anytime.
-__tls = []
-
 [dependencies]
-actix-service = "2"
+actix-service = "2.0.0"
-actix-codec = "0.5"
+actix-codec = "0.4.1"
-actix-utils = "3"
+actix-utils = "3.0.0"
-actix-rt = { version = "2.2", default-features = false }
+actix-rt = "2.2"
 
-bitflags = "2"
+ahash = "0.7"
+base64 = "0.13"
+bitflags = "1.2"
 bytes = "1"
 bytestring = "1"
-derive_more = { version = "2", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] }
+derive_more = "0.99.5"
 encoding_rs = "0.8"
-foldhash = "0.1"
+futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
-futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
+futures-util = { version = "0.3.7", default-features = false, features = ["alloc", "sink"] }
-http = "0.2.7"
+h2 = "0.3.1"
+http = "0.2.5"
 httparse = "1.5.1"
 httpdate = "1.0.1"
-itoa = "1"
+itoa = "0.4"
 language-tags = "0.3"
-mime = "0.3.4"
+local-channel = "0.1"
+log = "0.4"
+mime = "0.3"
 percent-encoding = "2.1"
+pin-project = "1.0.0"
 pin-project-lite = "0.2"
+rand = "0.8"
+sha-1 = "0.9"
 smallvec = "1.6.1"
-tokio = { version = "1.24.2", features = [] }
-tokio-util = { version = "0.7", features = ["io", "codec"] }
-tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
-# http2
+# tls
-h2 = { version = "0.3.26", optional = true }
+actix-tls = { version = "3.0.0-rc.1", default-features = false, optional = true }
 
-# websockets
+# compression
-local-channel = { version = "0.1", optional = true }
+brotli2 = { version="0.3.2", optional = true }
-base64 = { version = "0.22", optional = true }
-rand = { version = "0.9", optional = true }
-sha1 = { version = "0.10", optional = true }
-
-# openssl/rustls
-actix-tls = { version = "3.4", default-features = false, optional = true }
-
-# compress-*
-brotli = { version = "7", optional = true }
 flate2 = { version = "1.0.13", optional = true }
-zstd = { version = "0.13", optional = true }
+zstd = { version = "0.9", optional = true }
 
 [dev-dependencies]
-actix-http-test = { version = "3", features = ["openssl"] }
+actix-server = "2.0.0-beta.9"
-actix-server = "2"
+actix-http-test = { version = "3.0.0-beta.7", features = ["openssl"] }
-actix-tls = { version = "3.4", features = ["openssl", "rustls-0_23-webpki-roots"] }
+actix-tls = { version = "3.0.0-rc.1", features = ["openssl"] }
-actix-web = "4"
-
 async-stream = "0.3"
-criterion = { version = "0.5", features = ["html_reports"] }
+criterion = { version = "0.3", features = ["html_reports"] }
-divan = "0.1.8"
+env_logger = "0.9"
-env_logger = "0.11"
+rcgen = "0.8"
-futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
-memchr = "2.4"
-once_cell = "1.21"
-rcgen = "0.13"
 regex = "1.3"
-rustversion = "1"
+rustls-pemfile = "0.2"
-rustls-pemfile = "2"
+serde = { version = "1.0", features = ["derive"] }
-serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"
 static_assertions = "1"
-tls-openssl = { package = "openssl", version = "0.10.55" }
+tls-openssl = { package = "openssl", version = "0.10.9" }
-tls-rustls_023 = { package = "rustls", version = "0.23" }
+tls-rustls = { package = "rustls", version = "0.20.0" }
-tokio = { version = "1.24.2", features = ["net", "rt", "macros"] }
+tokio = { version = "1.2", features = ["net", "rt"] }
-
-[lints]
-workspace = true
 
 [[example]]
 name = "ws"
-required-features = ["ws", "rustls-0_23"]
+required-features = ["rustls"]
-
-[[example]]
-name = "tls_rustls"
-required-features = ["http2", "rustls-0_23"]
 
 [[bench]]
-name = "response-body-compression"
+name = "write-camel-case"
 harness = false
-required-features = ["compress-brotli", "compress-gzip", "compress-zstd"]
 
 [[bench]]
-name = "date-formatting"
+name = "status-line"
+harness = false
+
+[[bench]]
+name = "uninit-headers"
 harness = false

actix-http/README.md

@@ -1,21 +1,22 @@
-# `actix-http`
+# actix-http
 
-> HTTP types and services for the Actix ecosystem.
+> HTTP primitives for the Actix ecosystem.
-
-<!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http)
-[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.10.0)](https://docs.rs/actix-http/3.10.0)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.0.0-beta.14)](https://docs.rs/actix-http/3.0.0-beta.14)
-![Version](https://img.shields.io/badge/rustc-1.72+-ab6000.svg)
+[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-http/3.10.0/status.svg)](https://deps.rs/crate/actix-http/3.10.0)
+[![dependency status](https://deps.rs/crate/actix-http/3.0.0-beta.14/status.svg)](https://deps.rs/crate/actix-http/3.0.0-beta.14)
 [![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.52
+
+## Example
 
 ```rust
 use std::{env, io};
@@ -24,7 +25,7 @@ use actix_http::{HttpService, Response};
 use actix_server::Server;
 use futures_util::future;
 use http::header::HeaderValue;
-use tracing::info;
+use log::info;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -48,3 +49,18 @@ async fn main() -> io::Result<()> {
         .await
 }
 ```
+
+## License
+
+This project is licensed under either of
+
+* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0))
+* MIT license ([LICENSE-MIT](LICENSE-MIT) or [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT))
+
+at your option.
+
+## Code of Conduct
+
+Contribution to the actix-http crate is organized under the terms of the
+Contributor Covenant, the maintainer of actix-http, @fafhrd91, promises to
+intervene to uphold that code of conduct.

actix-http/benches/date-formatting.rs

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

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

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

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

actix-http/examples/actix-web.rs

@@ -1,27 +0,0 @@
-use actix_http::HttpService;
-use actix_server::Server;
-use actix_service::map_config;
-use actix_web::{dev::AppConfig, get, App, Responder};
-
-#[get("/")]
-async fn index() -> impl Responder {
-    "Hello, world. From Actix Web!"
-}
-
-#[tokio::main(flavor = "current_thread")]
-async fn main() -> std::io::Result<()> {
-    Server::build()
-        .bind("hello-world", "127.0.0.1:8080", || {
-            // construct actix-web app
-            let app = App::new().service(index);
-
-            HttpService::build()
-                // pass the app to service builder
-                // map_config is used to map App's configuration to ServiceBuilder
-                // h1 will configure server to only use HTTP/1.1
-                .h1(map_config(app, |_| AppConfig::default()))
-                .tcp()
-        })?
-        .run()
-        .await
-}

actix-http/examples/bench.rs

@@ -1,27 +0,0 @@
-use std::{convert::Infallible, io, time::Duration};
-
-use actix_http::{HttpService, Request, Response, StatusCode};
-use actix_server::Server;
-use once_cell::sync::Lazy;
-
-static STR: Lazy<String> = Lazy::new(|| "HELLO WORLD ".repeat(20));
-
-#[actix_rt::main]
-async fn main() -> io::Result<()> {
-    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
-
-    Server::build()
-        .bind("dispatcher-benchmark", ("127.0.0.1", 8080), || {
-            HttpService::build()
-                .client_request_timeout(Duration::from_secs(1))
-                .finish(|_: Request| async move {
-                    let mut res = Response::build(StatusCode::OK);
-                    Ok::<_, Infallible>(res.body(&**STR))
-                })
-                .tcp()
-        })?
-        // limiting number of workers so that bench client is not sharing as many resources
-        .workers(4)
-        .run()
-        .await
-}

actix-http/examples/echo.rs

@@ -1,11 +1,10 @@
-use std::{io, time::Duration};
+use std::io;
 
-use actix_http::{Error, HttpService, Request, Response, StatusCode};
+use actix_http::{http::StatusCode, Error, HttpService, Request, Response};
 use actix_server::Server;
 use bytes::BytesMut;
 use futures_util::StreamExt as _;
 use http::header::HeaderValue;
-use tracing::info;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -14,24 +13,26 @@ async fn main() -> io::Result<()> {
     Server::build()
         .bind("echo", ("127.0.0.1", 8080), || {
             HttpService::build()
-                .client_request_timeout(Duration::from_secs(1))
+                .client_timeout(1000)
-                .client_disconnect_timeout(Duration::from_secs(1))
+                .client_disconnect(1000)
-                // handles HTTP/1.1 and HTTP/2
                 .finish(|mut req: Request| async move {
                     let mut body = BytesMut::new();
                     while let Some(item) = req.payload().next().await {
                         body.extend_from_slice(&item?);
                     }
 
-                    info!("request body: {body:?}");
+                    log::info!("request body: {:?}", body);
 
-                    let res = Response::build(StatusCode::OK)
+                    Ok::<_, Error>(
-                        .insert_header(("x-head", HeaderValue::from_static("dummy value!")))
+                        Response::build(StatusCode::OK)
-                        .body(body);
+                            .insert_header((
-
+                                "x-head",
-                    Ok::<_, Error>(res)
+                                HeaderValue::from_static("dummy value!"),
+                            ))
+                            .body(body),
+                    )
                 })
-                .tcp() // No TLS
+                .tcp()
         })?
         .run()
         .await

actix-http/examples/echo2.rs

@@ -1,34 +1,31 @@
 use std::io;
 
-use actix_http::{
+use actix_http::{body::AnyBody, http::HeaderValue, http::StatusCode};
-    body::{BodyStream, MessageBody},
+use actix_http::{Error, HttpService, Request, Response};
-    header, Error, HttpMessage, HttpService, Request, Response, StatusCode,
+use actix_server::Server;
-};
+use bytes::BytesMut;
+use futures_util::StreamExt as _;
 
-async fn handle_request(mut req: Request) -> Result<Response<impl MessageBody>, Error> {
+async fn handle_request(mut req: Request) -> Result<Response<AnyBody>, Error> {
-    let mut res = Response::build(StatusCode::OK);
+    let mut body = BytesMut::new();
-
+    while let Some(item) = req.payload().next().await {
-    if let Some(ct) = req.headers().get(header::CONTENT_TYPE) {
+        body.extend_from_slice(&item?)
-        res.insert_header((header::CONTENT_TYPE, ct));
     }
 
-    // echo request payload stream as (chunked) response body
+    log::info!("request body: {:?}", body);
-    let res = res.message_body(BodyStream::new(req.payload().take()))?;
 
-    Ok(res)
+    Ok(Response::build(StatusCode::OK)
+        .insert_header(("x-head", HeaderValue::from_static("dummy value!")))
+        .body(body))
 }
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
     env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
 
-    actix_server::Server::build()
+    Server::build()
         .bind("echo", ("127.0.0.1", 8080), || {
-            HttpService::build()
+            HttpService::build().finish(handle_request).tcp()
-                // handles HTTP/1.1 only
-                .h1(handle_request)
-                // No TLS
-                .tcp()
         })?
         .run()
         .await

actix-http/examples/h2c-detect.rs

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

actix-http/examples/h2spec.rs

@@ -1,25 +0,0 @@
-use std::{convert::Infallible, io};
-
-use actix_http::{HttpService, Request, Response, StatusCode};
-use actix_server::Server;
-use once_cell::sync::Lazy;
-
-static STR: Lazy<String> = Lazy::new(|| "HELLO WORLD ".repeat(100));
-
-#[actix_rt::main]
-async fn main() -> io::Result<()> {
-    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
-
-    Server::build()
-        .bind("h2spec", ("127.0.0.1", 8080), || {
-            HttpService::build()
-                .h2(|_: Request| async move {
-                    let mut res = Response::build(StatusCode::OK);
-                    Ok::<_, Infallible>(res.body(&**STR))
-                })
-                .tcp()
-        })?
-        .workers(4)
-        .run()
-        .await
-}

actix-http/examples/hello-world.rs

@@ -1,8 +1,8 @@
-use std::{convert::Infallible, io, time::Duration};
+use std::{convert::Infallible, io};
 
-use actix_http::{header::HeaderValue, HttpService, Request, Response, StatusCode};
+use actix_http::{http::StatusCode, HttpService, Response};
 use actix_server::Server;
-use tracing::info;
+use http::header::HeaderValue;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -11,19 +11,16 @@ async fn main() -> io::Result<()> {
     Server::build()
         .bind("hello-world", ("127.0.0.1", 8080), || {
             HttpService::build()
-                .client_request_timeout(Duration::from_secs(1))
+                .client_timeout(1000)
-                .client_disconnect_timeout(Duration::from_secs(1))
+                .client_disconnect(1000)
-                .on_connect_ext(|_, ext| {
+                .finish(|req| async move {
-                    ext.insert(42u32);
+                    log::info!("{:?}", req);
-                })
-                .finish(|req: Request| async move {
-                    info!("{req:?}");
 
                     let mut res = Response::build(StatusCode::OK);
-                    res.insert_header(("x-head", HeaderValue::from_static("dummy value!")));
+                    res.insert_header((
-
+                        "x-head",
-                    let forty_two = req.conn_data::<u32>().unwrap().to_string();
+                        HeaderValue::from_static("dummy value!"),
-                    res.insert_header(("x-forty-two", HeaderValue::from_str(&forty_two).unwrap()));
+                    ));
 
                     Ok::<_, Infallible>(res.body("Hello world!"))
                 })

actix-http/examples/streaming-error.rs

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

actix-http/examples/tls_rustls.rs

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

actix-http/examples/ws.rs

@@ -1,7 +1,7 @@
 //! Sets up a WebSocket server over TCP and TLS.
 //! Sends a heartbeat message every 4 seconds but does not respond to any incoming frames.
 
-extern crate tls_rustls_023 as rustls;
+extern crate tls_rustls as rustls;
 
 use std::{
     io,
@@ -10,13 +10,13 @@ use std::{
     time::Duration,
 };
 
+use actix_codec::Encoder;
 use actix_http::{body::BodyStream, error::Error, ws, HttpService, Request, Response};
 use actix_rt::time::{interval, Interval};
 use actix_server::Server;
 use bytes::{Bytes, BytesMut};
 use bytestring::ByteString;
 use futures_core::{ready, Stream};
-use tokio_util::codec::Encoder;
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
@@ -27,22 +27,20 @@ async fn main() -> io::Result<()> {
             HttpService::build().h1(handler).tcp()
         })?
         .bind("tls", ("127.0.0.1", 8443), || {
-            HttpService::build()
+            HttpService::build().finish(handler).rustls(tls_config())
-                .finish(handler)
-                .rustls_0_23(tls_config())
         })?
         .run()
         .await
 }
 
 async fn handler(req: Request) -> Result<Response<BodyStream<Heartbeat>>, Error> {
-    tracing::info!("handshaking");
+    log::info!("handshaking");
     let mut res = ws::handshake(req.head())?;
 
     // handshake will always fail under HTTP/2
 
-    tracing::info!("responding");
+    log::info!("responding");
-    res.message_body(BodyStream::new(Heartbeat::new(ws::Codec::new())))
+    Ok(res.message_body(BodyStream::new(Heartbeat::new(ws::Codec::new())))?)
 }
 
 struct Heartbeat {
@@ -62,8 +60,11 @@ impl Heartbeat {
 impl Stream for Heartbeat {
     type Item = Result<Bytes, Error>;
 
-    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+    fn poll_next(
-        tracing::trace!("poll");
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Self::Item>> {
+        log::trace!("poll");
 
         ready!(self.as_mut().interval.poll_tick(cx));
 
@@ -84,27 +85,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/rustfmt.toml

@@ -0,0 +1,5 @@
+max_width = 89
+reorder_imports = true
+#wrap_comments = true
+#fn_args_density = "Compressed"
+#use_small_heuristics = false

actix-http/src/body/body.rs

@@ -0,0 +1,333 @@
+use std::{
+    borrow::Cow,
+    error::Error as StdError,
+    fmt, mem,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
+use bytes::{Bytes, BytesMut};
+use futures_core::Stream;
+use pin_project::pin_project;
+
+use crate::error::Error;
+
+use super::{BodySize, BodyStream, MessageBody, MessageBodyMapErr, SizedStream};
+
+#[deprecated(since = "4.0.0", note = "Renamed to `AnyBody`.")]
+pub type Body = AnyBody;
+
+/// Represents various types of HTTP message body.
+#[pin_project(project = AnyBodyProj)]
+#[derive(Clone)]
+pub enum AnyBody<B = BoxBody> {
+    /// Empty response. `Content-Length` header is not set.
+    None,
+
+    /// Complete, in-memory response body.
+    Bytes(Bytes),
+
+    /// Generic / Other message body.
+    Body(#[pin] B),
+}
+
+impl AnyBody {
+    /// Constructs a "body" representing an empty response.
+    pub fn none() -> Self {
+        Self::None
+    }
+
+    /// Constructs a new, 0-length body.
+    pub fn empty() -> Self {
+        Self::Bytes(Bytes::new())
+    }
+
+    /// Create boxed body from generic message body.
+    pub fn new_boxed<B>(body: B) -> Self
+    where
+        B: MessageBody + 'static,
+        B::Error: Into<Box<dyn StdError + 'static>>,
+    {
+        Self::Body(BoxBody::from_body(body))
+    }
+
+    /// Constructs new `AnyBody` instance from a slice of bytes by copying it.
+    ///
+    /// If your bytes container is owned, it may be cheaper to use a `From` impl.
+    pub fn copy_from_slice(s: &[u8]) -> Self {
+        Self::Bytes(Bytes::copy_from_slice(s))
+    }
+
+    #[doc(hidden)]
+    #[deprecated(since = "4.0.0", note = "Renamed to `copy_from_slice`.")]
+    pub fn from_slice(s: &[u8]) -> Self {
+        Self::Bytes(Bytes::copy_from_slice(s))
+    }
+}
+
+impl<B> AnyBody<B>
+where
+    B: MessageBody + 'static,
+    B::Error: Into<Box<dyn StdError + 'static>>,
+{
+    /// Create body from generic message body.
+    pub fn new(body: B) -> Self {
+        Self::Body(body)
+    }
+
+    pub fn into_boxed(self) -> AnyBody {
+        match self {
+            Self::None => AnyBody::None,
+            Self::Bytes(bytes) => AnyBody::Bytes(bytes),
+            Self::Body(body) => AnyBody::new_boxed(body),
+        }
+    }
+}
+
+impl<B> MessageBody for AnyBody<B>
+where
+    B: MessageBody,
+    B::Error: Into<Box<dyn StdError>> + 'static,
+{
+    type Error = Error;
+
+    fn size(&self) -> BodySize {
+        match self {
+            AnyBody::None => BodySize::None,
+            AnyBody::Bytes(ref bin) => BodySize::Sized(bin.len() as u64),
+            AnyBody::Body(ref body) => body.size(),
+        }
+    }
+
+    fn poll_next(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<Bytes, Self::Error>>> {
+        match self.project() {
+            AnyBodyProj::None => Poll::Ready(None),
+            AnyBodyProj::Bytes(bin) => {
+                let len = bin.len();
+                if len == 0 {
+                    Poll::Ready(None)
+                } else {
+                    Poll::Ready(Some(Ok(mem::take(bin))))
+                }
+            }
+
+            AnyBodyProj::Body(body) => body
+                .poll_next(cx)
+                .map_err(|err| Error::new_body().with_cause(err)),
+        }
+    }
+}
+
+impl PartialEq for AnyBody {
+    fn eq(&self, other: &AnyBody) -> bool {
+        match *self {
+            AnyBody::None => matches!(*other, AnyBody::None),
+            AnyBody::Bytes(ref b) => match *other {
+                AnyBody::Bytes(ref b2) => b == b2,
+                _ => false,
+            },
+            AnyBody::Body(_) => false,
+        }
+    }
+}
+
+impl<S: fmt::Debug> fmt::Debug for AnyBody<S> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            AnyBody::None => write!(f, "AnyBody::None"),
+            AnyBody::Bytes(ref bytes) => write!(f, "AnyBody::Bytes({:?})", bytes),
+            AnyBody::Body(ref stream) => write!(f, "AnyBody::Message({:?})", stream),
+        }
+    }
+}
+
+impl<B> From<&'static str> for AnyBody<B> {
+    fn from(string: &'static str) -> Self {
+        Self::Bytes(Bytes::from_static(string.as_ref()))
+    }
+}
+
+impl<B> From<&'static [u8]> for AnyBody<B> {
+    fn from(bytes: &'static [u8]) -> Self {
+        Self::Bytes(Bytes::from_static(bytes))
+    }
+}
+
+impl<B> From<Vec<u8>> for AnyBody<B> {
+    fn from(vec: Vec<u8>) -> Self {
+        Self::Bytes(Bytes::from(vec))
+    }
+}
+
+impl<B> From<String> for AnyBody<B> {
+    fn from(string: String) -> Self {
+        Self::Bytes(Bytes::from(string))
+    }
+}
+
+impl<B> From<&'_ String> for AnyBody<B> {
+    fn from(string: &String) -> Self {
+        Self::Bytes(Bytes::copy_from_slice(AsRef::<[u8]>::as_ref(&string)))
+    }
+}
+
+impl<B> From<Cow<'_, str>> for AnyBody<B> {
+    fn from(string: Cow<'_, str>) -> Self {
+        match string {
+            Cow::Owned(s) => Self::from(s),
+            Cow::Borrowed(s) => {
+                Self::Bytes(Bytes::copy_from_slice(AsRef::<[u8]>::as_ref(s)))
+            }
+        }
+    }
+}
+
+impl<B> From<Bytes> for AnyBody<B> {
+    fn from(bytes: Bytes) -> Self {
+        Self::Bytes(bytes)
+    }
+}
+
+impl<B> From<BytesMut> for AnyBody<B> {
+    fn from(bytes: BytesMut) -> Self {
+        Self::Bytes(bytes.freeze())
+    }
+}
+
+impl<S, E> From<SizedStream<S>> for AnyBody<SizedStream<S>>
+where
+    S: Stream<Item = Result<Bytes, E>> + 'static,
+    E: Into<Box<dyn StdError>> + 'static,
+{
+    fn from(stream: SizedStream<S>) -> Self {
+        AnyBody::new(stream)
+    }
+}
+
+impl<S, E> From<SizedStream<S>> for AnyBody
+where
+    S: Stream<Item = Result<Bytes, E>> + 'static,
+    E: Into<Box<dyn StdError>> + 'static,
+{
+    fn from(stream: SizedStream<S>) -> Self {
+        AnyBody::new_boxed(stream)
+    }
+}
+
+impl<S, E> From<BodyStream<S>> for AnyBody<BodyStream<S>>
+where
+    S: Stream<Item = Result<Bytes, E>> + 'static,
+    E: Into<Box<dyn StdError>> + 'static,
+{
+    fn from(stream: BodyStream<S>) -> Self {
+        AnyBody::new(stream)
+    }
+}
+
+impl<S, E> From<BodyStream<S>> for AnyBody
+where
+    S: Stream<Item = Result<Bytes, E>> + 'static,
+    E: Into<Box<dyn StdError>> + 'static,
+{
+    fn from(stream: BodyStream<S>) -> Self {
+        AnyBody::new_boxed(stream)
+    }
+}
+
+/// A boxed message body with boxed errors.
+pub struct BoxBody(Pin<Box<dyn MessageBody<Error = Box<dyn StdError>>>>);
+
+impl BoxBody {
+    /// Boxes a `MessageBody` and any errors it generates.
+    pub fn from_body<B>(body: B) -> Self
+    where
+        B: MessageBody + 'static,
+        B::Error: Into<Box<dyn StdError + 'static>>,
+    {
+        let body = MessageBodyMapErr::new(body, Into::into);
+        Self(Box::pin(body))
+    }
+
+    /// Returns a mutable pinned reference to the inner message body type.
+    pub fn as_pin_mut(
+        &mut self,
+    ) -> Pin<&mut (dyn MessageBody<Error = Box<dyn StdError>>)> {
+        self.0.as_mut()
+    }
+}
+
+impl fmt::Debug for BoxBody {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str("BoxAnyBody(dyn MessageBody)")
+    }
+}
+
+impl MessageBody for BoxBody {
+    type Error = Error;
+
+    fn size(&self) -> BodySize {
+        self.0.size()
+    }
+
+    fn poll_next(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<Bytes, Self::Error>>> {
+        self.0
+            .as_mut()
+            .poll_next(cx)
+            .map_err(|err| Error::new_body().with_cause(err))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::marker::PhantomPinned;
+
+    use static_assertions::{assert_impl_all, assert_not_impl_all};
+
+    use super::*;
+    use crate::body::to_bytes;
+
+    struct PinType(PhantomPinned);
+
+    impl MessageBody for PinType {
+        type Error = crate::Error;
+
+        fn size(&self) -> BodySize {
+            unimplemented!()
+        }
+
+        fn poll_next(
+            self: Pin<&mut Self>,
+            _cx: &mut Context<'_>,
+        ) -> Poll<Option<Result<Bytes, Self::Error>>> {
+            unimplemented!()
+        }
+    }
+
+    assert_impl_all!(AnyBody<()>: MessageBody, fmt::Debug, Send, Sync, Unpin);
+    assert_impl_all!(AnyBody<AnyBody<()>>: MessageBody, fmt::Debug, Send, Sync, Unpin);
+    assert_impl_all!(AnyBody<Bytes>: MessageBody, fmt::Debug, Send, Sync, Unpin);
+    assert_impl_all!(AnyBody: MessageBody, fmt::Debug, Unpin);
+    assert_impl_all!(BoxBody: MessageBody, fmt::Debug, Unpin);
+    assert_impl_all!(AnyBody<PinType>: MessageBody);
+
+    assert_not_impl_all!(AnyBody: Send, Sync, Unpin);
+    assert_not_impl_all!(BoxBody: Send, Sync, Unpin);
+    assert_not_impl_all!(AnyBody<PinType>: Send, Sync, Unpin);
+
+    #[actix_rt::test]
+    async fn nested_boxed_body() {
+        let body = AnyBody::copy_from_slice(&[1, 2, 3]);
+        let boxed_body = BoxBody::from_body(BoxBody::from_body(body));
+
+        assert_eq!(
+            to_bytes(boxed_body).await.unwrap(),
+            Bytes::from(vec![1, 2, 3]),
+        );
+    }
+}

actix-http/src/body/body_stream.rs

@@ -20,14 +20,11 @@ pin_project! {
     }
 }
 
-// TODO: from_infallible method
-
 impl<S, E> BodyStream<S>
 where
     S: Stream<Item = Result<Bytes, E>>,
     E: Into<Box<dyn StdError>> + 'static,
 {
-    #[inline]
     pub fn new(stream: S) -> Self {
         BodyStream { stream }
     }
@@ -40,15 +37,15 @@ where
 {
     type Error = E;
 
-    #[inline]
     fn size(&self) -> BodySize {
         BodySize::Stream
     }
 
     /// 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<'_>,
@@ -78,8 +75,7 @@ mod tests {
     use derive_more::{Display, Error};
     use futures_core::ready;
     use futures_util::{stream, FutureExt as _};
-    use pin_project_lite::pin_project;
+    use static_assertions::{assert_impl_all, assert_not_impl_all};
-    use static_assertions::{assert_impl_all, assert_not_impl_any};
 
     use super::*;
     use crate::body::to_bytes;
@@ -90,10 +86,10 @@ mod tests {
     assert_impl_all!(BodyStream<stream::Empty<Result<Bytes, Infallible>>>: MessageBody);
     assert_impl_all!(BodyStream<stream::Repeat<Result<Bytes, Infallible>>>: MessageBody);
 
-    assert_not_impl_any!(BodyStream<stream::Empty<Bytes>>: MessageBody);
+    assert_not_impl_all!(BodyStream<stream::Empty<Bytes>>: MessageBody);
-    assert_not_impl_any!(BodyStream<stream::Repeat<Bytes>>: MessageBody);
+    assert_not_impl_all!(BodyStream<stream::Repeat<Bytes>>: MessageBody);
     // crate::Error is not Clone
-    assert_not_impl_any!(BodyStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
+    assert_not_impl_all!(BodyStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
 
     #[actix_rt::test]
     async fn skips_empty_chunks() {
@@ -131,7 +127,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]
@@ -166,18 +162,17 @@ mod tests {
 
     #[actix_rt::test]
     async fn stream_delayed_error() {
-        let body = BodyStream::new(stream::iter(vec![Ok(Bytes::from("1")), Err(StreamErr)]));
+        let body =
+            BodyStream::new(stream::iter(vec![Ok(Bytes::from("1")), Err(StreamErr)]));
         assert!(matches!(to_bytes(body).await, Err(StreamErr)));
 
-        pin_project! {
+        #[pin_project::pin_project(project = TimeDelayStreamProj)]
         #[derive(Debug)]
-            #[project = TimeDelayStreamProj]
         enum TimeDelayStream {
             Start,
-                Sleep { delay: Pin<Box<Sleep>> },
+            Sleep(Pin<Box<Sleep>>),
             Done,
         }
-        }
 
         impl Stream for TimeDelayStream {
             type Item = Result<Bytes, StreamErr>;
@@ -189,14 +184,12 @@ mod tests {
                 match self.as_mut().get_mut() {
                     TimeDelayStream::Start => {
                         let sleep = sleep(Duration::from_millis(1));
-                        self.as_mut().set(TimeDelayStream::Sleep {
+                        self.as_mut().set(TimeDelayStream::Sleep(Box::pin(sleep)));
-                            delay: Box::pin(sleep),
-                        });
                         cx.waker().wake_by_ref();
                         Poll::Pending
                     }
 
-                    TimeDelayStream::Sleep { ref mut delay } => {
+                    TimeDelayStream::Sleep(ref mut delay) => {
                         ready!(delay.poll_unpin(cx));
                         self.set(TimeDelayStream::Done);
                         cx.waker().wake_by_ref();

actix-http/src/body/boxed.rs

@@ -1,121 +0,0 @@
-use std::{
-    error::Error as StdError,
-    fmt,
-    pin::Pin,
-    task::{Context, Poll},
-};
-
-use bytes::Bytes;
-
-use super::{BodySize, MessageBody, MessageBodyMapErr};
-use crate::body;
-
-/// A boxed message body with boxed errors.
-#[derive(Debug)]
-pub struct BoxBody(BoxBodyInner);
-
-enum BoxBodyInner {
-    None(body::None),
-    Bytes(Bytes),
-    Stream(Pin<Box<dyn MessageBody<Error = Box<dyn StdError>>>>),
-}
-
-impl fmt::Debug for BoxBodyInner {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::None(arg0) => f.debug_tuple("None").field(arg0).finish(),
-            Self::Bytes(arg0) => f.debug_tuple("Bytes").field(arg0).finish(),
-            Self::Stream(_) => f.debug_tuple("Stream").field(&"dyn MessageBody").finish(),
-        }
-    }
-}
-
-impl BoxBody {
-    /// Boxes body type, erasing type information.
-    ///
-    /// If the body type to wrap is unknown or generic it is better to use [`MessageBody::boxed`] to
-    /// avoid double boxing.
-    #[inline]
-    pub fn new<B>(body: B) -> Self
-    where
-        B: MessageBody + 'static,
-    {
-        match body.size() {
-            BodySize::None => Self(BoxBodyInner::None(body::None)),
-            _ => match body.try_into_bytes() {
-                Ok(bytes) => Self(BoxBodyInner::Bytes(bytes)),
-                Err(body) => {
-                    let body = MessageBodyMapErr::new(body, Into::into);
-                    Self(BoxBodyInner::Stream(Box::pin(body)))
-                }
-            },
-        }
-    }
-
-    /// Returns a mutable pinned reference to the inner message body type.
-    #[inline]
-    pub fn as_pin_mut(&mut self) -> Pin<&mut Self> {
-        Pin::new(self)
-    }
-}
-
-impl MessageBody for BoxBody {
-    type Error = Box<dyn StdError>;
-
-    #[inline]
-    fn size(&self) -> BodySize {
-        match &self.0 {
-            BoxBodyInner::None(none) => none.size(),
-            BoxBodyInner::Bytes(bytes) => bytes.size(),
-            BoxBodyInner::Stream(stream) => stream.size(),
-        }
-    }
-
-    #[inline]
-    fn poll_next(
-        mut self: Pin<&mut Self>,
-        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::Bytes(body) => Pin::new(body).poll_next(cx).map_err(|err| match err {}),
-            BoxBodyInner::Stream(body) => Pin::new(body).poll_next(cx),
-        }
-    }
-
-    #[inline]
-    fn try_into_bytes(self) -> Result<Bytes, Self> {
-        match self.0 {
-            BoxBodyInner::None(body) => Ok(body.try_into_bytes().unwrap()),
-            BoxBodyInner::Bytes(body) => Ok(body.try_into_bytes().unwrap()),
-            _ => Err(self),
-        }
-    }
-
-    #[inline]
-    fn boxed(self) -> BoxBody {
-        self
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use static_assertions::{assert_impl_all, assert_not_impl_any};
-
-    use super::*;
-    use crate::body::to_bytes;
-
-    assert_impl_all!(BoxBody: fmt::Debug, MessageBody, Unpin);
-    assert_not_impl_any!(BoxBody: Send, Sync);
-
-    #[actix_rt::test]
-    async fn nested_boxed_body() {
-        let body = Bytes::from_static(&[1, 2, 3]);
-        let boxed_body = BoxBody::new(BoxBody::new(body));
-
-        assert_eq!(
-            to_bytes(boxed_body).await.unwrap(),
-            Bytes::from(vec![1, 2, 3]),
-        );
-    }
-}

actix-http/src/body/either.rs

@@ -1,122 +0,0 @@
-use std::{
-    pin::Pin,
-    task::{Context, Poll},
-};
-
-use bytes::Bytes;
-use pin_project_lite::pin_project;
-
-use super::{BodySize, BoxBody, MessageBody};
-use crate::Error;
-
-pin_project! {
-    /// An "either" type specialized for body types.
-    ///
-    /// It is common, in middleware especially, to conditionally return an inner service's unknown/
-    /// generic body `B` type or return early with a new response. This type's "right" variant
-    /// defaults to `BoxBody` since error responses are the common case.
-    ///
-    /// For example, middleware will often have `type Response = ServiceResponse<EitherBody<B>>`.
-    /// This means that the inner service's response body type maps to the `Left` variant and the
-    /// middleware's own error responses use the default `Right` variant of `BoxBody`. Of course,
-    /// there's no reason it couldn't use `EitherBody<B, String>` instead if its alternative
-    /// responses have a known type.
-    #[project = EitherBodyProj]
-    #[derive(Debug, Clone)]
-    pub enum EitherBody<L, R = BoxBody> {
-        /// A body of type `L`.
-        Left { #[pin] body: L },
-
-        /// A body of type `R`.
-        Right { #[pin] body: R },
-    }
-}
-
-impl<L> EitherBody<L, BoxBody> {
-    /// Creates new `EitherBody` left variant with a boxed right variant.
-    ///
-    /// If the expected `R` type will be inferred and is not `BoxBody` then use the
-    /// [`left`](Self::left) constructor instead.
-    #[inline]
-    pub fn new(body: L) -> Self {
-        Self::Left { body }
-    }
-}
-
-impl<L, R> EitherBody<L, R> {
-    /// Creates new `EitherBody` using left variant.
-    #[inline]
-    pub fn left(body: L) -> Self {
-        Self::Left { body }
-    }
-
-    /// Creates new `EitherBody` using right variant.
-    #[inline]
-    pub fn right(body: R) -> Self {
-        Self::Right { body }
-    }
-}
-
-impl<L, R> MessageBody for EitherBody<L, R>
-where
-    L: MessageBody + 'static,
-    R: MessageBody + 'static,
-{
-    type Error = Error;
-
-    #[inline]
-    fn size(&self) -> BodySize {
-        match self {
-            EitherBody::Left { body } => body.size(),
-            EitherBody::Right { body } => body.size(),
-        }
-    }
-
-    #[inline]
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-        match self.project() {
-            EitherBodyProj::Left { body } => body
-                .poll_next(cx)
-                .map_err(|err| Error::new_body().with_cause(err)),
-            EitherBodyProj::Right { body } => body
-                .poll_next(cx)
-                .map_err(|err| Error::new_body().with_cause(err)),
-        }
-    }
-
-    #[inline]
-    fn try_into_bytes(self) -> Result<Bytes, Self> {
-        match self {
-            EitherBody::Left { body } => body
-                .try_into_bytes()
-                .map_err(|body| EitherBody::Left { body }),
-            EitherBody::Right { body } => body
-                .try_into_bytes()
-                .map_err(|body| EitherBody::Right { body }),
-        }
-    }
-
-    #[inline]
-    fn boxed(self) -> BoxBody {
-        match self {
-            EitherBody::Left { body } => body.boxed(),
-            EitherBody::Right { body } => body.boxed(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn type_parameter_inference() {
-        let _body: EitherBody<(), _> = EitherBody::new(());
-
-        let _body: EitherBody<_, ()> = EitherBody::left(());
-        let _body: EitherBody<(), _> = EitherBody::right(());
-    }
-}

actix-http/src/body/message_body.rs

@@ -2,7 +2,6 @@
 
 use std::{
     convert::Infallible,
-    error::Error as StdError,
     mem,
     pin::Pin,
     task::{Context, Poll},
@@ -12,252 +11,83 @@ use bytes::{Bytes, BytesMut};
 use futures_core::ready;
 use pin_project_lite::pin_project;
 
-use super::{BodySize, BoxBody};
+use super::BodySize;
 
-/// An interface for types that can be used as a response body.
+/// An interface for response bodies.
-///
-/// It is not usually necessary to create custom body types, this trait is already [implemented for
-/// a large number of sensible body types](#foreign-impls) including:
-/// - Empty body: `()`
-/// - Text-based: `String`, `&'static str`, [`ByteString`](https://docs.rs/bytestring/1).
-/// - Byte-based: `Bytes`, `BytesMut`, `Vec<u8>`, `&'static [u8]`;
-/// - Streams: [`BodyStream`](super::BodyStream), [`SizedStream`](super::SizedStream)
-///
-/// # Examples
-/// ```
-/// # use std::convert::Infallible;
-/// # use std::task::{Poll, Context};
-/// # use std::pin::Pin;
-/// # use bytes::Bytes;
-/// # use actix_http::body::{BodySize, MessageBody};
-/// struct Repeat {
-///     chunk: String,
-///     n_times: usize,
-/// }
-///
-/// impl MessageBody for Repeat {
-///     type Error = Infallible;
-///
-///     fn size(&self) -> BodySize {
-///         BodySize::Sized((self.chunk.len() * self.n_times) as u64)
-///     }
-///
-///     fn poll_next(
-///         self: Pin<&mut Self>,
-///         _cx: &mut Context<'_>,
-///     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-///         let payload_string = self.chunk.repeat(self.n_times);
-///         let payload_bytes = Bytes::from(payload_string);
-///         Poll::Ready(Some(Ok(payload_bytes)))
-///     }
-/// }
-/// ```
 pub trait MessageBody {
-    /// The type of error that will be returned if streaming body fails.
+    type Error;
-    ///
-    /// Since it is not appropriate to generate a response mid-stream, it only requires `Error` for
-    /// internal use and logging.
-    type Error: Into<Box<dyn StdError>>;
 
     /// Body size hint.
-    ///
-    /// If [`BodySize::None`] is returned, optimizations that skip reading the body are allowed.
     fn size(&self) -> BodySize;
 
     /// Attempt to pull out the next chunk of body bytes.
-    ///
-    /// # Return Value
-    /// Similar to the `Stream` interface, there are several possible return values, each indicating
-    /// a distinct state:
-    /// - `Poll::Pending` means that this body's next chunk is not ready yet. Implementations must
-    ///   ensure that the current task will be notified when the next chunk may be ready.
-    /// - `Poll::Ready(Some(val))` means that the body has successfully produced a chunk, `val`,
-    ///   and may produce further values on subsequent `poll_next` calls.
-    /// - `Poll::Ready(None)` means that the body is complete, and `poll_next` should not be
-    ///   invoked again.
-    ///
-    /// # Panics
-    /// Once a body is complete (i.e., `poll_next` returned `Ready(None)`), calling its `poll_next`
-    /// method again may panic, block forever, or cause other kinds of problems; this trait places
-    /// no requirements on the effects of such a call. However, as the `poll_next` method is not
-    /// marked unsafe, Rust’s usual rules apply: calls must never cause UB, regardless of its state.
     fn poll_next(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>>;
-
-    /// Try to convert into the complete chunk of body bytes.
-    ///
-    /// Override this method if the complete body can be trivially extracted. This is useful for
-    /// optimizations where `poll_next` calls can be avoided.
-    ///
-    /// Body types with [`BodySize::None`] are allowed to return empty `Bytes`. Although, if calling
-    /// this method, it is recommended to check `size` first and return early.
-    ///
-    /// # Errors
-    /// The default implementation will error and return the original type back to the caller for
-    /// further use.
-    #[inline]
-    fn try_into_bytes(self) -> Result<Bytes, Self>
-    where
-        Self: Sized,
-    {
-        Err(self)
-    }
-
-    /// Wraps this body into a `BoxBody`.
-    ///
-    /// No-op when called on a `BoxBody`, meaning there is no risk of double boxing when calling
-    /// this on a generic `MessageBody`. Prefer this over [`BoxBody::new`] when a boxed body
-    /// is required.
-    #[inline]
-    fn boxed(self) -> BoxBody
-    where
-        Self: Sized + 'static,
-    {
-        BoxBody::new(self)
-    }
 }
 
-mod foreign_impls {
+impl MessageBody for () {
-    use std::{borrow::Cow, ops::DerefMut};
-
-    use super::*;
-
-    impl<B> MessageBody for &mut B
-    where
-        B: MessageBody + Unpin + ?Sized,
-    {
-        type Error = B::Error;
-
-        fn size(&self) -> BodySize {
-            (**self).size()
-        }
-
-        fn poll_next(
-            mut self: Pin<&mut Self>,
-            cx: &mut Context<'_>,
-        ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-            Pin::new(&mut **self).poll_next(cx)
-        }
-    }
-
-    impl MessageBody for Infallible {
     type Error = Infallible;
 
-        fn size(&self) -> BodySize {
-            match *self {}
-        }
-
-        fn poll_next(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-        ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-            match *self {}
-        }
-    }
-
-    impl MessageBody for () {
-        type Error = Infallible;
-
-        #[inline]
     fn size(&self) -> BodySize {
         BodySize::Sized(0)
     }
 
-        #[inline]
     fn poll_next(
         self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
+        _: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         Poll::Ready(None)
     }
+}
 
-        #[inline]
+impl<B> MessageBody for Box<B>
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
+where
-            Ok(Bytes::new())
+    B: MessageBody + Unpin,
-        }
+{
-    }
-
-    impl<B> MessageBody for Box<B>
-    where
-        B: MessageBody + Unpin + ?Sized,
-    {
     type Error = B::Error;
 
-        #[inline]
     fn size(&self) -> BodySize {
         self.as_ref().size()
     }
 
-        #[inline]
     fn poll_next(
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         Pin::new(self.get_mut().as_mut()).poll_next(cx)
     }
-    }
+}
 
-    impl<T, B> MessageBody for Pin<T>
+impl<B> MessageBody for Pin<Box<B>>
-    where
+where
-        T: DerefMut<Target = B> + Unpin,
+    B: MessageBody,
-        B: MessageBody + ?Sized,
+{
-    {
     type Error = B::Error;
 
-        #[inline]
     fn size(&self) -> BodySize {
         self.as_ref().size()
     }
 
-        #[inline]
     fn poll_next(
-            self: Pin<&mut Self>,
+        mut self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-            self.get_mut().as_mut().poll_next(cx)
+        self.as_mut().poll_next(cx)
-        }
     }
+}
 
-    impl MessageBody for &'static [u8] {
+impl MessageBody for Bytes {
     type Error = Infallible;
 
-        #[inline]
     fn size(&self) -> BodySize {
         BodySize::Sized(self.len() as u64)
     }
 
-        #[inline]
     fn poll_next(
         self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
+        _: &mut Context<'_>,
-        ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-            if self.is_empty() {
-                Poll::Ready(None)
-            } else {
-                Poll::Ready(Some(Ok(Bytes::from_static(mem::take(self.get_mut())))))
-            }
-        }
-
-        #[inline]
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            Ok(Bytes::from_static(self))
-        }
-    }
-
-    impl MessageBody for Bytes {
-        type Error = Infallible;
-
-        #[inline]
-        fn size(&self) -> BodySize {
-            BodySize::Sized(self.len() as u64)
-        }
-
-        #[inline]
-        fn poll_next(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         if self.is_empty() {
             Poll::Ready(None)
@@ -265,25 +95,18 @@ mod foreign_impls {
             Poll::Ready(Some(Ok(mem::take(self.get_mut()))))
         }
     }
+}
 
-        #[inline]
+impl MessageBody for BytesMut {
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            Ok(self)
-        }
-    }
-
-    impl MessageBody for BytesMut {
     type Error = Infallible;
 
-        #[inline]
     fn size(&self) -> BodySize {
         BodySize::Sized(self.len() as u64)
     }
 
-        #[inline]
     fn poll_next(
         self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
+        _: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         if self.is_empty() {
             Poll::Ready(None)
@@ -291,180 +114,65 @@ mod foreign_impls {
             Poll::Ready(Some(Ok(mem::take(self.get_mut()).freeze())))
         }
     }
+}
 
-        #[inline]
+impl MessageBody for &'static str {
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            Ok(self.freeze())
-        }
-    }
-
-    impl MessageBody for Vec<u8> {
     type Error = Infallible;
 
-        #[inline]
     fn size(&self) -> BodySize {
         BodySize::Sized(self.len() as u64)
     }
 
-        #[inline]
     fn poll_next(
         self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
+        _: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         if self.is_empty() {
             Poll::Ready(None)
         } else {
-                Poll::Ready(Some(Ok(mem::take(self.get_mut()).into())))
+            Poll::Ready(Some(Ok(Bytes::from_static(
+                mem::take(self.get_mut()).as_ref(),
+            ))))
         }
     }
+}
 
-        #[inline]
+impl MessageBody for Vec<u8> {
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            Ok(Bytes::from(self))
-        }
-    }
-
-    impl MessageBody for Cow<'static, [u8]> {
     type Error = Infallible;
 
-        #[inline]
     fn size(&self) -> BodySize {
         BodySize::Sized(self.len() as u64)
     }
 
-        #[inline]
     fn poll_next(
         self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
+        _: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         if self.is_empty() {
             Poll::Ready(None)
         } else {
-                let bytes = match mem::take(self.get_mut()) {
+            Poll::Ready(Some(Ok(Bytes::from(mem::take(self.get_mut())))))
-                    Cow::Borrowed(b) => Bytes::from_static(b),
-                    Cow::Owned(b) => Bytes::from(b),
-                };
-                Poll::Ready(Some(Ok(bytes)))
         }
     }
+}
 
-        #[inline]
+impl MessageBody for String {
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            match self {
-                Cow::Borrowed(b) => Ok(Bytes::from_static(b)),
-                Cow::Owned(b) => Ok(Bytes::from(b)),
-            }
-        }
-    }
-
-    impl MessageBody for &'static str {
     type Error = Infallible;
 
-        #[inline]
     fn size(&self) -> BodySize {
         BodySize::Sized(self.len() as u64)
     }
 
-        #[inline]
     fn poll_next(
         self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
+        _: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         if self.is_empty() {
             Poll::Ready(None)
         } else {
-                let string = mem::take(self.get_mut());
+            Poll::Ready(Some(Ok(Bytes::from(
-                let bytes = Bytes::from_static(string.as_bytes());
+                mem::take(self.get_mut()).into_bytes(),
-                Poll::Ready(Some(Ok(bytes)))
+            ))))
-            }
-        }
-
-        #[inline]
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            Ok(Bytes::from_static(self.as_bytes()))
-        }
-    }
-
-    impl MessageBody for String {
-        type Error = Infallible;
-
-        #[inline]
-        fn size(&self) -> BodySize {
-            BodySize::Sized(self.len() as u64)
-        }
-
-        #[inline]
-        fn poll_next(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-        ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-            if self.is_empty() {
-                Poll::Ready(None)
-            } else {
-                let string = mem::take(self.get_mut());
-                Poll::Ready(Some(Ok(Bytes::from(string))))
-            }
-        }
-
-        #[inline]
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            Ok(Bytes::from(self))
-        }
-    }
-
-    impl MessageBody for Cow<'static, str> {
-        type Error = Infallible;
-
-        #[inline]
-        fn size(&self) -> BodySize {
-            BodySize::Sized(self.len() as u64)
-        }
-
-        #[inline]
-        fn poll_next(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-        ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-            if self.is_empty() {
-                Poll::Ready(None)
-            } else {
-                let bytes = match mem::take(self.get_mut()) {
-                    Cow::Borrowed(s) => Bytes::from_static(s.as_bytes()),
-                    Cow::Owned(s) => Bytes::from(s.into_bytes()),
-                };
-                Poll::Ready(Some(Ok(bytes)))
-            }
-        }
-
-        #[inline]
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            match self {
-                Cow::Borrowed(s) => Ok(Bytes::from_static(s.as_bytes())),
-                Cow::Owned(s) => Ok(Bytes::from(s.into_bytes())),
-            }
-        }
-    }
-
-    impl MessageBody for bytestring::ByteString {
-        type Error = Infallible;
-
-        #[inline]
-        fn size(&self) -> BodySize {
-            BodySize::Sized(self.len() as u64)
-        }
-
-        #[inline]
-        fn poll_next(
-            self: Pin<&mut Self>,
-            _cx: &mut Context<'_>,
-        ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-            let string = mem::take(self.get_mut());
-            Poll::Ready(Some(Ok(string.into_bytes())))
-        }
-
-        #[inline]
-        fn try_into_bytes(self) -> Result<Bytes, Self> {
-            Ok(self.into_bytes())
         }
     }
 }
@@ -494,11 +202,9 @@ impl<B, F, E> MessageBody for MessageBodyMapErr<B, F>
 where
     B: MessageBody,
     F: FnOnce(B::Error) -> E,
-    E: Into<Box<dyn StdError>>,
 {
     type Error = E;
 
-    #[inline]
     fn size(&self) -> BodySize {
         self.body.size()
     }
@@ -519,222 +225,4 @@ where
             None => Poll::Ready(None),
         }
     }
-
-    #[inline]
-    fn try_into_bytes(self) -> Result<Bytes, Self> {
-        let Self { body, mapper } = self;
-        body.try_into_bytes().map_err(|body| Self { body, mapper })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use actix_rt::pin;
-    use actix_utils::future::poll_fn;
-    use futures_util::stream;
-
-    use super::*;
-    use crate::body::{self, EitherBody};
-
-    macro_rules! assert_poll_next {
-        ($pin:expr, $exp:expr) => {
-            assert_eq!(
-                poll_fn(|cx| $pin.as_mut().poll_next(cx))
-                    .await
-                    .unwrap() // unwrap option
-                    .unwrap(), // unwrap result
-                $exp
-            );
-        };
-    }
-
-    macro_rules! assert_poll_next_none {
-        ($pin:expr) => {
-            assert!(poll_fn(|cx| $pin.as_mut().poll_next(cx)).await.is_none());
-        };
-    }
-
-    #[allow(unused_allocation)] // triggered by `Box::new(()).size()`
-    #[actix_rt::test]
-    async fn boxing_equivalence() {
-        assert_eq!(().size(), BodySize::Sized(0));
-        assert_eq!(().size(), Box::new(()).size());
-        assert_eq!(().size(), Box::pin(()).size());
-
-        let pl = Box::new(());
-        pin!(pl);
-        assert_poll_next_none!(pl);
-
-        let mut pl = Box::pin(());
-        assert_poll_next_none!(pl);
-    }
-
-    #[actix_rt::test]
-    async fn mut_equivalence() {
-        assert_eq!(().size(), BodySize::Sized(0));
-        assert_eq!(().size(), (&(&mut ())).size());
-
-        let pl = &mut ();
-        pin!(pl);
-        assert_poll_next_none!(pl);
-
-        let pl = &mut Box::new(());
-        pin!(pl);
-        assert_poll_next_none!(pl);
-
-        let mut body = body::SizedStream::new(
-            8,
-            stream::iter([
-                Ok::<_, std::io::Error>(Bytes::from("1234")),
-                Ok(Bytes::from("5678")),
-            ]),
-        );
-        let body = &mut body;
-        assert_eq!(body.size(), BodySize::Sized(8));
-        pin!(body);
-        assert_poll_next!(body, Bytes::from_static(b"1234"));
-        assert_poll_next!(body, Bytes::from_static(b"5678"));
-        assert_poll_next_none!(body);
-    }
-
-    #[allow(clippy::let_unit_value)]
-    #[actix_rt::test]
-    async fn test_unit() {
-        let pl = ();
-        assert_eq!(pl.size(), BodySize::Sized(0));
-        pin!(pl);
-        assert_poll_next_none!(pl);
-    }
-
-    #[actix_rt::test]
-    async fn test_static_str() {
-        assert_eq!("".size(), BodySize::Sized(0));
-        assert_eq!("test".size(), BodySize::Sized(4));
-
-        let pl = "test";
-        pin!(pl);
-        assert_poll_next!(pl, Bytes::from("test"));
-    }
-
-    #[actix_rt::test]
-    async fn test_static_bytes() {
-        assert_eq!(b"".as_ref().size(), BodySize::Sized(0));
-        assert_eq!(b"test".as_ref().size(), BodySize::Sized(4));
-
-        let pl = b"test".as_ref();
-        pin!(pl);
-        assert_poll_next!(pl, Bytes::from("test"));
-    }
-
-    #[actix_rt::test]
-    async fn test_vec() {
-        assert_eq!(vec![0; 0].size(), BodySize::Sized(0));
-        assert_eq!(Vec::from("test").size(), BodySize::Sized(4));
-
-        let pl = Vec::from("test");
-        pin!(pl);
-        assert_poll_next!(pl, Bytes::from("test"));
-    }
-
-    #[actix_rt::test]
-    async fn test_bytes() {
-        assert_eq!(Bytes::new().size(), BodySize::Sized(0));
-        assert_eq!(Bytes::from_static(b"test").size(), BodySize::Sized(4));
-
-        let pl = Bytes::from_static(b"test");
-        pin!(pl);
-        assert_poll_next!(pl, Bytes::from("test"));
-    }
-
-    #[actix_rt::test]
-    async fn test_bytes_mut() {
-        assert_eq!(BytesMut::new().size(), BodySize::Sized(0));
-        assert_eq!(BytesMut::from(b"test".as_ref()).size(), BodySize::Sized(4));
-
-        let pl = BytesMut::from("test");
-        pin!(pl);
-        assert_poll_next!(pl, Bytes::from("test"));
-    }
-
-    #[actix_rt::test]
-    async fn test_string() {
-        assert_eq!(String::new().size(), BodySize::Sized(0));
-        assert_eq!("test".to_owned().size(), BodySize::Sized(4));
-
-        let pl = "test".to_owned();
-        pin!(pl);
-        assert_poll_next!(pl, Bytes::from("test"));
-    }
-
-    #[actix_rt::test]
-    async fn complete_body_combinators() {
-        let body = Bytes::from_static(b"test");
-        let body = BoxBody::new(body);
-        let body = EitherBody::<_, ()>::left(body);
-        let body = EitherBody::<(), _>::right(body);
-        // Do not support try_into_bytes:
-        // let body = Box::new(body);
-        // let body = Box::pin(body);
-
-        assert_eq!(body.try_into_bytes().unwrap(), Bytes::from("test"));
-    }
-
-    #[actix_rt::test]
-    async fn complete_body_combinators_poll() {
-        let body = Bytes::from_static(b"test");
-        let body = BoxBody::new(body);
-        let body = EitherBody::<_, ()>::left(body);
-        let body = EitherBody::<(), _>::right(body);
-        let mut body = body;
-
-        assert_eq!(body.size(), BodySize::Sized(4));
-        assert_poll_next!(Pin::new(&mut body), Bytes::from("test"));
-        assert_poll_next_none!(Pin::new(&mut body));
-    }
-
-    #[actix_rt::test]
-    async fn none_body_combinators() {
-        fn none_body() -> BoxBody {
-            let body = body::None;
-            let body = BoxBody::new(body);
-            let body = EitherBody::<_, ()>::left(body);
-            let body = EitherBody::<(), _>::right(body);
-            body.boxed()
-        }
-
-        assert_eq!(none_body().size(), BodySize::None);
-        assert_eq!(none_body().try_into_bytes().unwrap(), Bytes::new());
-        assert_poll_next_none!(Pin::new(&mut none_body()));
-    }
-
-    // down-casting used to be done with a method on MessageBody trait
-    // test is kept to demonstrate equivalence of Any trait
-    #[actix_rt::test]
-    async fn test_body_casting() {
-        let mut body = String::from("hello cast");
-        // let mut resp_body: &mut dyn MessageBody<Error = Error> = &mut body;
-        let resp_body: &mut dyn std::any::Any = &mut body;
-        let body = resp_body.downcast_ref::<String>().unwrap();
-        assert_eq!(body, "hello cast");
-        let body = &mut resp_body.downcast_mut::<String>().unwrap();
-        body.push('!');
-        let body = resp_body.downcast_ref::<String>().unwrap();
-        assert_eq!(body, "hello cast!");
-        let not_body = resp_body.downcast_ref::<()>();
-        assert!(not_body.is_none());
-    }
-
-    #[actix_rt::test]
-    async fn non_owning_to_bytes() {
-        let mut body = BoxBody::new(());
-        let bytes = body::to_bytes(&mut body).await.unwrap();
-        assert_eq!(bytes, Bytes::new());
-
-        let mut body = body::BodyStream::new(stream::iter([
-            Ok::<_, std::io::Error>(Bytes::from("1234")),
-            Ok(Bytes::from("5678")),
-        ]));
-        let bytes = body::to_bytes(&mut body).await.unwrap();
-        assert_eq!(bytes, Bytes::from_static(b"12345678"));
-    }
 }

actix-http/src/body/mod.rs

@@ -1,27 +1,272 @@
 //! Traits and structures to aid consuming and writing HTTP payloads.
-//!
-//! "Body" and "payload" are used somewhat interchangeably in this documentation.
 
-// Though the spec kinda reads like "payload" is the possibly-transfer-encoded part of the message
+use std::task::Poll;
-// and the "body" is the intended possibly-decoded version of that.
 
+use actix_rt::pin;
+use actix_utils::future::poll_fn;
+use bytes::{Bytes, BytesMut};
+use futures_core::ready;
+
+#[allow(clippy::module_inception)]
+mod body;
 mod body_stream;
-mod boxed;
-mod either;
 mod message_body;
-mod none;
 mod size;
 mod sized_stream;
-mod utils;
 
+#[allow(deprecated)]
+pub use self::body::{AnyBody, Body, BoxBody};
+pub use self::body_stream::BodyStream;
+pub use self::message_body::MessageBody;
 pub(crate) use self::message_body::MessageBodyMapErr;
-pub use self::{
+pub use self::size::BodySize;
-    body_stream::BodyStream,
+pub use self::sized_stream::SizedStream;
-    boxed::BoxBody,
+
-    either::EitherBody,
+/// Collects the body produced by a `MessageBody` implementation into `Bytes`.
-    message_body::MessageBody,
+///
-    none::None,
+/// Any errors produced by the body stream are returned immediately.
-    size::BodySize,
+///
-    sized_stream::SizedStream,
+/// # Examples
-    utils::{to_bytes, to_bytes_limited, BodyLimitExceeded},
+/// ```
-};
+/// use actix_http::body::{AnyBody, to_bytes};
+/// use bytes::Bytes;
+///
+/// # async fn test_to_bytes() {
+/// let body = AnyBody::none();
+/// let bytes = to_bytes(body).await.unwrap();
+/// assert!(bytes.is_empty());
+///
+/// let body = AnyBody::copy_from_slice(b"123");
+/// let bytes = to_bytes(body).await.unwrap();
+/// assert_eq!(bytes, b"123"[..]);
+/// # }
+/// ```
+pub async fn to_bytes<B: MessageBody>(body: B) -> Result<Bytes, B::Error> {
+    let cap = match body.size() {
+        BodySize::None | BodySize::Sized(0) => return Ok(Bytes::new()),
+        BodySize::Sized(size) => size as usize,
+        // good enough first guess for chunk size
+        BodySize::Stream => 32_768,
+    };
+
+    let mut buf = BytesMut::with_capacity(cap);
+
+    pin!(body);
+
+    poll_fn(|cx| loop {
+        let body = body.as_mut();
+
+        match ready!(body.poll_next(cx)) {
+            Some(Ok(bytes)) => buf.extend_from_slice(&*bytes),
+            None => return Poll::Ready(Ok(())),
+            Some(Err(err)) => return Poll::Ready(Err(err)),
+        }
+    })
+    .await?;
+
+    Ok(buf.freeze())
+}
+
+#[cfg(test)]
+mod tests {
+    use std::pin::Pin;
+
+    use actix_rt::pin;
+    use actix_utils::future::poll_fn;
+    use bytes::{Bytes, BytesMut};
+
+    use super::{to_bytes, AnyBody as TestAnyBody, BodySize, MessageBody as _};
+
+    impl AnyBody {
+        pub(crate) fn get_ref(&self) -> &[u8] {
+            match *self {
+                AnyBody::Bytes(ref bin) => bin,
+                _ => panic!(),
+            }
+        }
+    }
+
+    /// AnyBody alias because rustc does not (can not?) infer the default type parameter.
+    type AnyBody = TestAnyBody;
+
+    #[actix_rt::test]
+    async fn test_static_str() {
+        assert_eq!(AnyBody::from("").size(), BodySize::Sized(0));
+        assert_eq!(AnyBody::from("test").size(), BodySize::Sized(4));
+        assert_eq!(AnyBody::from("test").get_ref(), b"test");
+
+        assert_eq!("test".size(), BodySize::Sized(4));
+        assert_eq!(
+            poll_fn(|cx| Pin::new(&mut "test").poll_next(cx))
+                .await
+                .unwrap()
+                .ok(),
+            Some(Bytes::from("test"))
+        );
+    }
+
+    #[actix_rt::test]
+    async fn test_static_bytes() {
+        assert_eq!(AnyBody::from(b"test".as_ref()).size(), BodySize::Sized(4));
+        assert_eq!(AnyBody::from(b"test".as_ref()).get_ref(), b"test");
+        assert_eq!(
+            AnyBody::copy_from_slice(b"test".as_ref()).size(),
+            BodySize::Sized(4)
+        );
+        assert_eq!(
+            AnyBody::copy_from_slice(b"test".as_ref()).get_ref(),
+            b"test"
+        );
+        let sb = Bytes::from(&b"test"[..]);
+        pin!(sb);
+
+        assert_eq!(sb.size(), BodySize::Sized(4));
+        assert_eq!(
+            poll_fn(|cx| sb.as_mut().poll_next(cx)).await.unwrap().ok(),
+            Some(Bytes::from("test"))
+        );
+    }
+
+    #[actix_rt::test]
+    async fn test_vec() {
+        assert_eq!(AnyBody::from(Vec::from("test")).size(), BodySize::Sized(4));
+        assert_eq!(AnyBody::from(Vec::from("test")).get_ref(), b"test");
+        let test_vec = Vec::from("test");
+        pin!(test_vec);
+
+        assert_eq!(test_vec.size(), BodySize::Sized(4));
+        assert_eq!(
+            poll_fn(|cx| test_vec.as_mut().poll_next(cx))
+                .await
+                .unwrap()
+                .ok(),
+            Some(Bytes::from("test"))
+        );
+    }
+
+    #[actix_rt::test]
+    async fn test_bytes() {
+        let b = Bytes::from("test");
+        assert_eq!(AnyBody::from(b.clone()).size(), BodySize::Sized(4));
+        assert_eq!(AnyBody::from(b.clone()).get_ref(), b"test");
+        pin!(b);
+
+        assert_eq!(b.size(), BodySize::Sized(4));
+        assert_eq!(
+            poll_fn(|cx| b.as_mut().poll_next(cx)).await.unwrap().ok(),
+            Some(Bytes::from("test"))
+        );
+    }
+
+    #[actix_rt::test]
+    async fn test_bytes_mut() {
+        let b = BytesMut::from("test");
+        assert_eq!(AnyBody::from(b.clone()).size(), BodySize::Sized(4));
+        assert_eq!(AnyBody::from(b.clone()).get_ref(), b"test");
+        pin!(b);
+
+        assert_eq!(b.size(), BodySize::Sized(4));
+        assert_eq!(
+            poll_fn(|cx| b.as_mut().poll_next(cx)).await.unwrap().ok(),
+            Some(Bytes::from("test"))
+        );
+    }
+
+    #[actix_rt::test]
+    async fn test_string() {
+        let b = "test".to_owned();
+        assert_eq!(AnyBody::from(b.clone()).size(), BodySize::Sized(4));
+        assert_eq!(AnyBody::from(b.clone()).get_ref(), b"test");
+        assert_eq!(AnyBody::from(&b).size(), BodySize::Sized(4));
+        assert_eq!(AnyBody::from(&b).get_ref(), b"test");
+        pin!(b);
+
+        assert_eq!(b.size(), BodySize::Sized(4));
+        assert_eq!(
+            poll_fn(|cx| b.as_mut().poll_next(cx)).await.unwrap().ok(),
+            Some(Bytes::from("test"))
+        );
+    }
+
+    #[actix_rt::test]
+    async fn test_unit() {
+        assert_eq!(().size(), BodySize::Sized(0));
+        assert!(poll_fn(|cx| Pin::new(&mut ()).poll_next(cx))
+            .await
+            .is_none());
+    }
+
+    #[actix_rt::test]
+    async fn test_box_and_pin() {
+        let val = Box::new(());
+        pin!(val);
+        assert_eq!(val.size(), BodySize::Sized(0));
+        assert!(poll_fn(|cx| val.as_mut().poll_next(cx)).await.is_none());
+
+        let mut val = Box::pin(());
+        assert_eq!(val.size(), BodySize::Sized(0));
+        assert!(poll_fn(|cx| val.as_mut().poll_next(cx)).await.is_none());
+    }
+
+    #[actix_rt::test]
+    async fn test_body_eq() {
+        assert!(
+            AnyBody::Bytes(Bytes::from_static(b"1"))
+                == AnyBody::Bytes(Bytes::from_static(b"1"))
+        );
+        assert!(AnyBody::Bytes(Bytes::from_static(b"1")) != AnyBody::None);
+    }
+
+    #[actix_rt::test]
+    async fn test_body_debug() {
+        assert!(format!("{:?}", AnyBody::None).contains("Body::None"));
+        assert!(format!("{:?}", AnyBody::from(Bytes::from_static(b"1"))).contains('1'));
+    }
+
+    #[actix_rt::test]
+    async fn test_serde_json() {
+        use serde_json::{json, Value};
+        assert_eq!(
+            AnyBody::from(
+                serde_json::to_vec(&Value::String("test".to_owned())).unwrap()
+            )
+            .size(),
+            BodySize::Sized(6)
+        );
+        assert_eq!(
+            AnyBody::from(
+                serde_json::to_vec(&json!({"test-key":"test-value"})).unwrap()
+            )
+            .size(),
+            BodySize::Sized(25)
+        );
+    }
+
+    // down-casting used to be done with a method on MessageBody trait
+    // test is kept to demonstrate equivalence of Any trait
+    #[actix_rt::test]
+    async fn test_body_casting() {
+        let mut body = String::from("hello cast");
+        // let mut resp_body: &mut dyn MessageBody<Error = Error> = &mut body;
+        let resp_body: &mut dyn std::any::Any = &mut body;
+        let body = resp_body.downcast_ref::<String>().unwrap();
+        assert_eq!(body, "hello cast");
+        let body = &mut resp_body.downcast_mut::<String>().unwrap();
+        body.push('!');
+        let body = resp_body.downcast_ref::<String>().unwrap();
+        assert_eq!(body, "hello cast!");
+        let not_body = resp_body.downcast_ref::<()>();
+        assert!(not_body.is_none());
+    }
+
+    #[actix_rt::test]
+    async fn test_to_bytes() {
+        let body = AnyBody::empty();
+        let bytes = to_bytes(body).await.unwrap();
+        assert!(bytes.is_empty());
+
+        let body = AnyBody::copy_from_slice(b"123");
+        let bytes = to_bytes(body).await.unwrap();
+        assert_eq!(bytes, b"123"[..]);
+    }
+}

actix-http/src/body/none.rs

@@ -1,51 +0,0 @@
-use std::{
-    convert::Infallible,
-    pin::Pin,
-    task::{Context, Poll},
-};
-
-use bytes::Bytes;
-
-use super::{BodySize, MessageBody};
-
-/// Body type for responses that forbid payloads.
-///
-/// This is distinct from an "empty" response which _would_ contain a `Content-Length` header.
-/// For an "empty" body, use `()` or `Bytes::new()`.
-///
-/// For example, the HTTP spec forbids a payload to be sent with a `204 No Content` response.
-/// In this case, the payload (or lack thereof) is implicit from the status code, so a
-/// `Content-Length` header is not required.
-#[derive(Debug, Clone, Copy, Default)]
-#[non_exhaustive]
-pub struct None;
-
-impl None {
-    /// Constructs new "none" body.
-    #[inline]
-    pub fn new() -> Self {
-        None
-    }
-}
-
-impl MessageBody for None {
-    type Error = Infallible;
-
-    #[inline]
-    fn size(&self) -> BodySize {
-        BodySize::None
-    }
-
-    #[inline]
-    fn poll_next(
-        self: Pin<&mut Self>,
-        _cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Self::Error>>> {
-        Poll::Ready(Option::None)
-    }
-
-    #[inline]
-    fn try_into_bytes(self) -> Result<Bytes, Self> {
-        Ok(Bytes::new())
-    }
-}

actix-http/src/body/size.rs

@@ -1,11 +1,9 @@
 /// Body size hint.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum BodySize {
-    /// Implicitly empty body.
+    /// Absence of body can be assumed from method or status code.
     ///
-    /// Will omit the Content-Length header. Used for responses to certain methods (e.g., `HEAD`) or
+    /// Will skip writing Content-Length header.
-    /// with particular status codes (e.g., 204 No Content). Consumers that read this as a body size
-    /// hint are allowed to make optimizations that skip reading or writing the payload.
     None,
 
     /// Known size body.
@@ -20,10 +18,7 @@ pub enum BodySize {
 }
 
 impl BodySize {
-    /// Equivalent to `BodySize::Sized(0)`;
+    /// Returns true if size hint indicates no or empty body.
-    pub const ZERO: Self = Self::Sized(0);
-
-    /// Returns true if size hint indicates omitted or empty body.
     ///
     /// Streams will return false because it cannot be known without reading the stream.
     ///

actix-http/src/body/sized_stream.rs

@@ -27,14 +27,11 @@ where
     S: Stream<Item = Result<Bytes, E>>,
     E: Into<Box<dyn StdError>> + 'static,
 {
-    #[inline]
     pub fn new(size: u64, stream: S) -> Self {
         SizedStream { size, stream }
     }
 }
 
-// TODO: from_infallible method
-
 impl<S, E> MessageBody for SizedStream<S>
 where
     S: Stream<Item = Result<Bytes, E>>,
@@ -42,9 +39,8 @@ where
 {
     type Error = E;
 
-    #[inline]
     fn size(&self) -> BodySize {
-        BodySize::Sized(self.size)
+        BodySize::Sized(self.size as u64)
     }
 
     /// Attempts to pull out the next value of the underlying [`Stream`].
@@ -76,7 +72,7 @@ mod tests {
     use actix_rt::pin;
     use actix_utils::future::poll_fn;
     use futures_util::stream;
-    use static_assertions::{assert_impl_all, assert_not_impl_any};
+    use static_assertions::{assert_impl_all, assert_not_impl_all};
 
     use super::*;
     use crate::body::to_bytes;
@@ -87,10 +83,10 @@ mod tests {
     assert_impl_all!(SizedStream<stream::Empty<Result<Bytes, Infallible>>>: MessageBody);
     assert_impl_all!(SizedStream<stream::Repeat<Result<Bytes, Infallible>>>: MessageBody);
 
-    assert_not_impl_any!(SizedStream<stream::Empty<Bytes>>: MessageBody);
+    assert_not_impl_all!(SizedStream<stream::Empty<Bytes>>: MessageBody);
-    assert_not_impl_any!(SizedStream<stream::Repeat<Bytes>>: MessageBody);
+    assert_not_impl_all!(SizedStream<stream::Repeat<Bytes>>: MessageBody);
     // crate::Error is not Clone
-    assert_not_impl_any!(SizedStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
+    assert_not_impl_all!(SizedStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
 
     #[actix_rt::test]
     async fn skips_empty_chunks() {

actix-http/src/body/utils.rs

@@ -1,198 +0,0 @@
-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`.
-///
-/// 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 {
-/// 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");
-/// # });
-/// ```
-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::Sized(size) if size as usize > limit => return Err(BodyLimitExceeded),
-        BodySize::Sized(size) => (size as usize).min(INITIAL_ALLOC_BYTES),
-        BodySize::Stream => INITIAL_ALLOC_BYTES,
-    };
-
-    let mut exceeded_limit = false;
-    let mut buf = BytesMut::with_capacity(cap);
-
-    pin!(body);
-
-    match poll_fn(|cx| loop {
-        let body = body.as_mut();
-
-        match ready!(body.poll_next(cx)) {
-            Some(Ok(bytes)) => {
-                // if limit is exceeded...
-                if buf.len() + bytes.len() > limit {
-                    // ...set flag to true and break out of poll_fn
-                    exceeded_limit = true;
-                    return Poll::Ready(Ok(()));
-                }
-
-                buf.extend_from_slice(&bytes)
-            }
-            None => return Poll::Ready(Ok(())),
-            Some(Err(err)) => return Poll::Ready(Err(err)),
-        }
-    })
-    .await
-    {
-        // propagate error returned from body poll
-        Err(err) => Ok(Err(err)),
-
-        // limit was exceeded while reading body
-        Ok(()) if exceeded_limit => Err(BodyLimitExceeded),
-
-        // otherwise return body buffer
-        Ok(()) => Ok(Ok(buf.freeze())),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::io;
-
-    use futures_util::{stream, StreamExt as _};
-
-    use super::*;
-    use crate::{
-        body::{BodyStream, SizedStream},
-        Error,
-    };
-
-    #[actix_rt::test]
-    async fn to_bytes_complete() {
-        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

@@ -1,22 +1,25 @@
-use std::{fmt, marker::PhantomData, net, rc::Rc, time::Duration};
+use std::{error::Error as StdError, fmt, marker::PhantomData, net, rc::Rc};
 
 use actix_codec::Framed;
 use actix_service::{IntoServiceFactory, Service, ServiceFactory};
 
 use crate::{
-    body::{BoxBody, MessageBody},
+    body::{AnyBody, MessageBody},
+    config::{KeepAlive, ServiceConfig},
     h1::{self, ExpectHandler, H1Service, UpgradeHandler},
+    h2::H2Service,
     service::HttpService,
-    ConnectCallback, Extensions, KeepAlive, Request, Response, ServiceConfig,
+    ConnectCallback, Extensions, Request, Response,
 };
 
-/// An HTTP service builder.
+/// A HTTP service builder
 ///
-/// This type can construct an instance of [`HttpService`] through a builder-like pattern.
+/// This type can be used to construct an instance of [`HttpService`] through a
+/// builder-like pattern.
 pub struct HttpServiceBuilder<T, S, X = ExpectHandler, U = UpgradeHandler> {
     keep_alive: KeepAlive,
-    client_request_timeout: Duration,
+    client_timeout: u64,
-    client_disconnect_timeout: Duration,
+    client_disconnect: u64,
     secure: bool,
     local_addr: Option<net::SocketAddr>,
     expect: X,
@@ -25,23 +28,21 @@ pub struct HttpServiceBuilder<T, S, X = ExpectHandler, U = UpgradeHandler> {
     _phantom: PhantomData<S>,
 }
 
-impl<T, S> Default for HttpServiceBuilder<T, S, ExpectHandler, UpgradeHandler>
+impl<T, S> HttpServiceBuilder<T, S, ExpectHandler, UpgradeHandler>
 where
     S: ServiceFactory<Request, Config = ()>,
-    S::Error: Into<Response<BoxBody>> + 'static,
+    S::Error: Into<Response<AnyBody>> + 'static,
     S::InitError: fmt::Debug,
     <S::Service as Service<Request>>::Future: 'static,
 {
-    fn default() -> Self {
+    /// Create instance of `ServiceConfigBuilder`
+    pub fn new() -> Self {
         HttpServiceBuilder {
-            // ServiceConfig parts (make sure defaults match)
+            keep_alive: KeepAlive::Timeout(5),
-            keep_alive: KeepAlive::default(),
+            client_timeout: 5000,
-            client_request_timeout: Duration::from_secs(5),
+            client_disconnect: 0,
-            client_disconnect_timeout: Duration::ZERO,
             secure: false,
             local_addr: None,
-
-            // dispatcher parts
             expect: ExpectHandler,
             upgrade: None,
             on_connect_ext: None,
@@ -53,21 +54,19 @@ where
 impl<T, S, X, U> HttpServiceBuilder<T, S, X, U>
 where
     S: ServiceFactory<Request, Config = ()>,
-    S::Error: Into<Response<BoxBody>> + 'static,
+    S::Error: Into<Response<AnyBody>> + 'static,
     S::InitError: fmt::Debug,
     <S::Service as Service<Request>>::Future: 'static,
     X: ServiceFactory<Request, Config = (), Response = Request>,
-    X::Error: Into<Response<BoxBody>>,
+    X::Error: Into<Response<AnyBody>>,
     X::InitError: fmt::Debug,
     U: ServiceFactory<(Request, Framed<T, h1::Codec>), Config = (), Response = ()>,
     U::Error: fmt::Display,
     U::InitError: fmt::Debug,
 {
-    /// Set connection keep-alive setting.
+    /// Set server keep-alive setting.
     ///
-    /// Applies to HTTP/1.1 keep-alive and HTTP/2 ping-pong.
+    /// By default keep alive is set to a 5 seconds.
-    ///
-    /// By default keep-alive is 5 seconds.
     pub fn keep_alive<W: Into<KeepAlive>>(mut self, val: W) -> Self {
         self.keep_alive = val.into();
         self
@@ -85,45 +84,33 @@ where
         self
     }
 
-    /// Set client request timeout (for first request).
+    /// Set server client timeout in milliseconds for first request.
     ///
-    /// Defines a timeout for reading client request header. If the client does not transmit the
+    /// Defines a timeout for reading client request header. If a client does not transmit
-    /// request head within this duration, the connection is terminated with a `408 Request Timeout`
+    /// the entire set headers within this time, the request is terminated with
-    /// response error.
+    /// the 408 (Request Time-out) error.
     ///
-    /// A duration of zero disables the timeout.
+    /// To disable timeout set value to 0.
     ///
-    /// By default, the client timeout is 5 seconds.
+    /// By default client timeout is set to 5000 milliseconds.
-    pub fn client_request_timeout(mut self, dur: Duration) -> Self {
+    pub fn client_timeout(mut self, val: u64) -> Self {
-        self.client_request_timeout = dur;
+        self.client_timeout = val;
         self
     }
 
-    #[doc(hidden)]
+    /// Set server connection disconnect timeout in milliseconds.
-    #[deprecated(since = "3.0.0", note = "Renamed to `client_request_timeout`.")]
-    pub fn client_timeout(self, dur: Duration) -> Self {
-        self.client_request_timeout(dur)
-    }
-
-    /// Set client connection disconnect timeout.
     ///
     /// Defines a timeout for disconnect connection. If a disconnect procedure does not complete
     /// within this time, the request get dropped. This timeout affects secure connections.
     ///
-    /// A duration of zero disables the timeout.
+    /// To disable timeout set value to 0.
     ///
-    /// By default, the disconnect timeout is disabled.
+    /// By default disconnect timeout is set to 0.
-    pub fn client_disconnect_timeout(mut self, dur: Duration) -> Self {
+    pub fn client_disconnect(mut self, val: u64) -> Self {
-        self.client_disconnect_timeout = dur;
+        self.client_disconnect = val;
         self
     }
 
-    #[doc(hidden)]
-    #[deprecated(since = "3.0.0", note = "Renamed to `client_disconnect_timeout`.")]
-    pub fn client_disconnect(self, dur: Duration) -> Self {
-        self.client_disconnect_timeout(dur)
-    }
-
     /// Provide service for `EXPECT: 100-Continue` support.
     ///
     /// Service get called with request that contains `EXPECT` header.
@@ -133,13 +120,13 @@ where
     where
         F: IntoServiceFactory<X1, Request>,
         X1: ServiceFactory<Request, Config = (), Response = Request>,
-        X1::Error: Into<Response<BoxBody>>,
+        X1::Error: Into<Response<AnyBody>>,
         X1::InitError: fmt::Debug,
     {
         HttpServiceBuilder {
             keep_alive: self.keep_alive,
-            client_request_timeout: self.client_request_timeout,
+            client_timeout: self.client_timeout,
-            client_disconnect_timeout: self.client_disconnect_timeout,
+            client_disconnect: self.client_disconnect,
             secure: self.secure,
             local_addr: self.local_addr,
             expect: expect.into_factory(),
@@ -162,8 +149,8 @@ where
     {
         HttpServiceBuilder {
             keep_alive: self.keep_alive,
-            client_request_timeout: self.client_request_timeout,
+            client_timeout: self.client_timeout,
-            client_disconnect_timeout: self.client_disconnect_timeout,
+            client_disconnect: self.client_disconnect,
             secure: self.secure,
             local_addr: self.local_addr,
             expect: self.expect,
@@ -186,19 +173,19 @@ where
         self
     }
 
-    /// Finish service configuration and create a service for the HTTP/1 protocol.
+    /// Finish service configuration and create a HTTP Service for HTTP/1 protocol.
     pub fn h1<F, B>(self, service: F) -> H1Service<T, S, B, X, U>
     where
         B: MessageBody,
         F: IntoServiceFactory<S, Request>,
-        S::Error: Into<Response<BoxBody>>,
+        S::Error: Into<Response<AnyBody>>,
         S::InitError: fmt::Debug,
         S::Response: Into<Response<B>>,
     {
         let cfg = ServiceConfig::new(
             self.keep_alive,
-            self.client_request_timeout,
+            self.client_timeout,
-            self.client_disconnect_timeout,
+            self.client_disconnect,
             self.secure,
             self.local_addr,
         );
@@ -209,26 +196,26 @@ where
             .on_connect_ext(self.on_connect_ext)
     }
 
-    /// Finish service configuration and create a service for the HTTP/2 protocol.
+    /// Finish service configuration and create a HTTP service for HTTP/2 protocol.
-    #[cfg(feature = "http2")]
+    pub fn h2<F, B>(self, service: F) -> H2Service<T, S, B>
-    pub fn h2<F, B>(self, service: F) -> crate::h2::H2Service<T, S, B>
     where
         F: IntoServiceFactory<S, Request>,
-        S::Error: Into<Response<BoxBody>> + 'static,
+        S::Error: Into<Response<AnyBody>> + 'static,
         S::InitError: fmt::Debug,
         S::Response: Into<Response<B>> + 'static,
 
         B: MessageBody + 'static,
+        B::Error: Into<Box<dyn StdError>>,
     {
         let cfg = ServiceConfig::new(
             self.keep_alive,
-            self.client_request_timeout,
+            self.client_timeout,
-            self.client_disconnect_timeout,
+            self.client_disconnect,
             self.secure,
             self.local_addr,
         );
 
-        crate::h2::H2Service::with_config(cfg, service.into_factory())
+        H2Service::with_config(cfg, service.into_factory())
             .on_connect_ext(self.on_connect_ext)
     }
 
@@ -236,16 +223,17 @@ where
     pub fn finish<F, B>(self, service: F) -> HttpService<T, S, B, X, U>
     where
         F: IntoServiceFactory<S, Request>,
-        S::Error: Into<Response<BoxBody>> + 'static,
+        S::Error: Into<Response<AnyBody>> + 'static,
         S::InitError: fmt::Debug,
         S::Response: Into<Response<B>> + 'static,
 
         B: MessageBody + 'static,
+        B::Error: Into<Box<dyn StdError>>,
     {
         let cfg = ServiceConfig::new(
             self.keep_alive,
-            self.client_request_timeout,
+            self.client_timeout,
-            self.client_disconnect_timeout,
+            self.client_disconnect,
             self.secure,
             self.local_addr,
         );

actix-http/src/config.rs

@@ -1,59 +1,106 @@
 use std::{
+    cell::Cell,
+    fmt::{self, Write},
     net,
     rc::Rc,
-    time::{Duration, Instant},
+    time::{Duration, SystemTime},
 };
 
+use actix_rt::{
+    task::JoinHandle,
+    time::{interval, sleep_until, Instant, Sleep},
+};
 use bytes::BytesMut;
 
-use crate::{date::DateService, KeepAlive};
+/// "Sun, 06 Nov 1994 08:49:37 GMT".len()
+pub(crate) const DATE_VALUE_LENGTH: usize = 29;
 
-/// HTTP service configuration.
+#[derive(Debug, PartialEq, Clone, Copy)]
-#[derive(Debug, Clone)]
+/// Server keep-alive setting
+pub enum KeepAlive {
+    /// Keep alive in seconds
+    Timeout(usize),
+
+    /// Rely on OS to shutdown tcp connection
+    Os,
+
+    /// Disabled
+    Disabled,
+}
+
+impl From<usize> for KeepAlive {
+    fn from(keepalive: usize) -> Self {
+        KeepAlive::Timeout(keepalive)
+    }
+}
+
+impl From<Option<usize>> for KeepAlive {
+    fn from(keepalive: Option<usize>) -> Self {
+        if let Some(keepalive) = keepalive {
+            KeepAlive::Timeout(keepalive)
+        } else {
+            KeepAlive::Disabled
+        }
+    }
+}
+
+/// Http service configuration
 pub struct ServiceConfig(Rc<Inner>);
 
-#[derive(Debug)]
 struct Inner {
-    keep_alive: KeepAlive,
+    keep_alive: Option<Duration>,
-    client_request_timeout: Duration,
+    client_timeout: u64,
-    client_disconnect_timeout: Duration,
+    client_disconnect: u64,
+    ka_enabled: bool,
     secure: bool,
     local_addr: Option<std::net::SocketAddr>,
     date_service: DateService,
 }
 
+impl Clone for ServiceConfig {
+    fn clone(&self) -> Self {
+        ServiceConfig(self.0.clone())
+    }
+}
+
 impl Default for ServiceConfig {
     fn default() -> Self {
-        Self::new(
+        Self::new(KeepAlive::Timeout(5), 0, 0, false, None)
-            KeepAlive::default(),
-            Duration::from_secs(5),
-            Duration::ZERO,
-            false,
-            None,
-        )
     }
 }
 
 impl ServiceConfig {
-    /// Create instance of `ServiceConfig`.
+    /// Create instance of `ServiceConfig`
     pub fn new(
         keep_alive: KeepAlive,
-        client_request_timeout: Duration,
+        client_timeout: u64,
-        client_disconnect_timeout: Duration,
+        client_disconnect: u64,
         secure: bool,
         local_addr: Option<net::SocketAddr>,
     ) -> ServiceConfig {
+        let (keep_alive, ka_enabled) = match keep_alive {
+            KeepAlive::Timeout(val) => (val as u64, true),
+            KeepAlive::Os => (0, true),
+            KeepAlive::Disabled => (0, false),
+        };
+        let keep_alive = if ka_enabled && keep_alive > 0 {
+            Some(Duration::from_secs(keep_alive))
+        } else {
+            None
+        };
+
         ServiceConfig(Rc::new(Inner {
-            keep_alive: keep_alive.normalize(),
+            keep_alive,
-            client_request_timeout,
+            ka_enabled,
-            client_disconnect_timeout,
+            client_timeout,
+            client_disconnect,
             secure,
             local_addr,
             date_service: DateService::new(),
         }))
     }
 
-    /// Returns `true` if connection is secure (i.e., using TLS / HTTPS).
+    /// Returns true if connection is secure (HTTPS)
     #[inline]
     pub fn secure(&self) -> bool {
         self.0.secure
@@ -67,97 +114,235 @@ impl ServiceConfig {
         self.0.local_addr
     }
 
-    /// Connection keep-alive setting.
+    /// Keep alive duration if configured.
     #[inline]
-    pub fn keep_alive(&self) -> KeepAlive {
+    pub fn keep_alive(&self) -> Option<Duration> {
         self.0.keep_alive
     }
 
-    /// Creates a time object representing the deadline for this connection's keep-alive period, if
+    /// Return state of connection keep-alive functionality
-    /// enabled.
+    #[inline]
-    ///
+    pub fn keep_alive_enabled(&self) -> bool {
-    /// When [`KeepAlive::Os`] or [`KeepAlive::Disabled`] is set, this will return `None`.
+        self.0.ka_enabled
-    pub fn keep_alive_deadline(&self) -> Option<Instant> {
+    }
-        match self.keep_alive() {
+
-            KeepAlive::Timeout(dur) => Some(self.now() + dur),
+    /// Client timeout for first request.
-            KeepAlive::Os => None,
+    #[inline]
-            KeepAlive::Disabled => None,
+    pub fn client_timer(&self) -> Option<Sleep> {
+        let delay_time = self.0.client_timeout;
+        if delay_time != 0 {
+            Some(sleep_until(self.now() + Duration::from_millis(delay_time)))
+        } else {
+            None
         }
     }
 
-    /// Creates a time object representing the deadline for the client to finish sending the head of
+    /// Client timeout for first request.
-    /// its first request.
+    pub fn client_timer_expire(&self) -> Option<Instant> {
-    ///
+        let delay = self.0.client_timeout;
-    /// Returns `None` if this `ServiceConfig was` constructed with `client_request_timeout: 0`.
+        if delay != 0 {
-    pub fn client_request_deadline(&self) -> Option<Instant> {
+            Some(self.now() + Duration::from_millis(delay))
-        let timeout = self.0.client_request_timeout;
+        } else {
-        (timeout != Duration::ZERO).then(|| self.now() + timeout)
+            None
+        }
     }
 
-    /// Creates a time object representing the deadline for the client to disconnect.
+    /// Client disconnect timer
-    pub fn client_disconnect_deadline(&self) -> Option<Instant> {
+    pub fn client_disconnect_timer(&self) -> Option<Instant> {
-        let timeout = self.0.client_disconnect_timeout;
+        let delay = self.0.client_disconnect;
-        (timeout != Duration::ZERO).then(|| self.now() + timeout)
+        if delay != 0 {
+            Some(self.now() + Duration::from_millis(delay))
+        } else {
+            None
+        }
     }
 
+    /// Return keep-alive timer delay is configured.
+    #[inline]
+    pub fn keep_alive_timer(&self) -> Option<Sleep> {
+        self.keep_alive().map(|ka| sleep_until(self.now() + ka))
+    }
+
+    /// Keep-alive expire time
+    pub fn keep_alive_expire(&self) -> Option<Instant> {
+        self.keep_alive().map(|ka| self.now() + ka)
+    }
+
+    #[inline]
     pub(crate) fn now(&self) -> Instant {
         self.0.date_service.now()
     }
 
-    /// Writes date header to `dst` buffer.
-    ///
-    /// Low-level method that utilizes the built-in efficient date service, requiring fewer syscalls
-    /// than normal. Note that a CRLF (`\r\n`) is included in what is written.
     #[doc(hidden)]
-    pub fn write_date_header(&self, dst: &mut BytesMut, camel_case: bool) {
+    pub fn set_date(&self, dst: &mut BytesMut) {
-        let mut buf: [u8; 37] = [0; 37];
+        let mut buf: [u8; 39] = [0; 39];
-
+        buf[..6].copy_from_slice(b"date: ");
-        buf[..6].copy_from_slice(if camel_case { b"Date: " } else { b"date: " });
-
         self.0
             .date_service
-            .with_date(|date| buf[6..35].copy_from_slice(&date.bytes));
+            .set_date(|date| buf[6..35].copy_from_slice(&date.bytes));
-
+        buf[35..].copy_from_slice(b"\r\n\r\n");
-        buf[35..].copy_from_slice(b"\r\n");
         dst.extend_from_slice(&buf);
     }
 
-    #[allow(unused)] // used with `http2` feature flag
+    pub(crate) fn set_date_header(&self, dst: &mut BytesMut) {
-    pub(crate) fn write_date_header_value(&self, dst: &mut BytesMut) {
         self.0
             .date_service
-            .with_date(|date| dst.extend_from_slice(&date.bytes));
+            .set_date(|date| dst.extend_from_slice(&date.bytes));
+    }
+}
+
+#[derive(Copy, Clone)]
+struct Date {
+    bytes: [u8; DATE_VALUE_LENGTH],
+    pos: usize,
+}
+
+impl Date {
+    fn new() -> Date {
+        let mut date = Date {
+            bytes: [0; DATE_VALUE_LENGTH],
+            pos: 0,
+        };
+        date.update();
+        date
+    }
+
+    fn update(&mut self) {
+        self.pos = 0;
+        write!(self, "{}", httpdate::fmt_http_date(SystemTime::now())).unwrap();
+    }
+}
+
+impl fmt::Write for Date {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        let len = s.len();
+        self.bytes[self.pos..self.pos + len].copy_from_slice(s.as_bytes());
+        self.pos += len;
+        Ok(())
+    }
+}
+
+/// Service for update Date and Instant periodically at 500 millis interval.
+struct DateService {
+    current: Rc<Cell<(Date, Instant)>>,
+    handle: JoinHandle<()>,
+}
+
+impl Drop for DateService {
+    fn drop(&mut self) {
+        // stop the timer update async task on drop.
+        self.handle.abort();
+    }
+}
+
+impl DateService {
+    fn new() -> Self {
+        // shared date and timer for DateService and update async task.
+        let current = Rc::new(Cell::new((Date::new(), Instant::now())));
+        let current_clone = Rc::clone(&current);
+        // spawn an async task sleep for 500 milli and update current date/timer in a loop.
+        // handle is used to stop the task on DateService drop.
+        let handle = actix_rt::spawn(async move {
+            #[cfg(test)]
+            let _notify = notify_on_drop::NotifyOnDrop::new();
+
+            let mut interval = interval(Duration::from_millis(500));
+            loop {
+                let now = interval.tick().await;
+                let date = Date::new();
+                current_clone.set((date, now));
+            }
+        });
+
+        DateService { current, handle }
+    }
+
+    fn now(&self) -> Instant {
+        self.current.get().1
+    }
+
+    fn set_date<F: FnMut(&Date)>(&self, mut f: F) {
+        f(&self.current.get().0);
+    }
+}
+
+// TODO: move to a util module for testing all spawn handle drop style tasks.
+/// Test Module for checking the drop state of certain async tasks that are spawned
+/// with `actix_rt::spawn`
+///
+/// The target task must explicitly generate `NotifyOnDrop` when spawn the task
+#[cfg(test)]
+mod notify_on_drop {
+    use std::cell::RefCell;
+
+    thread_local! {
+        static NOTIFY_DROPPED: RefCell<Option<bool>> = RefCell::new(None);
+    }
+
+    /// Check if the spawned task is dropped.
+    ///
+    /// # Panics
+    /// Panics when there was no `NotifyOnDrop` instance on current thread.
+    pub(crate) fn is_dropped() -> bool {
+        NOTIFY_DROPPED.with(|bool| {
+            bool.borrow()
+                .expect("No NotifyOnDrop existed on current thread")
+        })
+    }
+
+    pub(crate) struct NotifyOnDrop;
+
+    impl NotifyOnDrop {
+        /// # Panic:
+        ///
+        /// When construct multiple instances on any given thread.
+        pub(crate) fn new() -> Self {
+            NOTIFY_DROPPED.with(|bool| {
+                let mut bool = bool.borrow_mut();
+                if bool.is_some() {
+                    panic!("NotifyOnDrop existed on current thread");
+                } else {
+                    *bool = Some(false);
+                }
+            });
+
+            NotifyOnDrop
+        }
+    }
+
+    impl Drop for NotifyOnDrop {
+        fn drop(&mut self) {
+            NOTIFY_DROPPED.with(|bool| {
+                if let Some(b) = bool.borrow_mut().as_mut() {
+                    *b = true;
+                }
+            });
+        }
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use actix_rt::{
-        task::yield_now,
-        time::{sleep, sleep_until},
-    };
-    use memchr::memmem;
-
     use super::*;
-    use crate::{date::DATE_VALUE_LENGTH, notify_on_drop};
+
+    use actix_rt::{task::yield_now, time::sleep};
 
     #[actix_rt::test]
     async fn test_date_service_update() {
-        let settings =
+        let settings = ServiceConfig::new(KeepAlive::Os, 0, 0, false, None);
-            ServiceConfig::new(KeepAlive::Os, Duration::ZERO, Duration::ZERO, false, None);
 
         yield_now().await;
 
         let mut buf1 = BytesMut::with_capacity(DATE_VALUE_LENGTH + 10);
-        settings.write_date_header(&mut buf1, false);
+        settings.set_date(&mut buf1);
         let now1 = settings.now();
 
-        sleep_until((Instant::now() + Duration::from_secs(2)).into()).await;
+        sleep_until(Instant::now() + Duration::from_secs(2)).await;
         yield_now().await;
 
         let now2 = settings.now();
         let mut buf2 = BytesMut::with_capacity(DATE_VALUE_LENGTH + 10);
-        settings.write_date_header(&mut buf2, false);
+        settings.set_date(&mut buf2);
 
         assert_ne!(now1, now2);
 
@@ -210,27 +395,11 @@ mod tests {
 
     #[actix_rt::test]
     async fn test_date() {
-        let settings = ServiceConfig::default();
+        let settings = ServiceConfig::new(KeepAlive::Os, 0, 0, false, None);
-
         let mut buf1 = BytesMut::with_capacity(DATE_VALUE_LENGTH + 10);
-        settings.write_date_header(&mut buf1, false);
+        settings.set_date(&mut buf1);
-
         let mut buf2 = BytesMut::with_capacity(DATE_VALUE_LENGTH + 10);
-        settings.write_date_header(&mut buf2, false);
+        settings.set_date(&mut buf2);
-
         assert_eq!(buf1, buf2);
     }
-
-    #[actix_rt::test]
-    async fn test_date_camel_case() {
-        let settings = ServiceConfig::default();
-
-        let mut buf = BytesMut::with_capacity(DATE_VALUE_LENGTH + 10);
-        settings.write_date_header(&mut buf, false);
-        assert!(memmem::find(&buf, b"date:").is_some());
-
-        let mut buf = BytesMut::with_capacity(DATE_VALUE_LENGTH + 10);
-        settings.write_date_header(&mut buf, true);
-        assert!(memmem::find(&buf, b"Date:").is_some());
-    }
 }

actix-http/src/date.rs

@@ -1,92 +0,0 @@
-use std::{
-    cell::Cell,
-    fmt::{self, Write},
-    rc::Rc,
-    time::{Duration, Instant, SystemTime},
-};
-
-use actix_rt::{task::JoinHandle, time::interval};
-
-/// "Thu, 01 Jan 1970 00:00:00 GMT".len()
-pub(crate) const DATE_VALUE_LENGTH: usize = 29;
-
-#[derive(Clone, Copy)]
-pub(crate) struct Date {
-    pub(crate) bytes: [u8; DATE_VALUE_LENGTH],
-    pos: usize,
-}
-
-impl Date {
-    fn new() -> Date {
-        let mut date = Date {
-            bytes: [0; DATE_VALUE_LENGTH],
-            pos: 0,
-        };
-        date.update();
-        date
-    }
-
-    fn update(&mut self) {
-        self.pos = 0;
-        write!(self, "{}", httpdate::HttpDate::from(SystemTime::now())).unwrap();
-    }
-}
-
-impl fmt::Write for Date {
-    fn write_str(&mut self, s: &str) -> fmt::Result {
-        let len = s.len();
-        self.bytes[self.pos..self.pos + len].copy_from_slice(s.as_bytes());
-        self.pos += len;
-        Ok(())
-    }
-}
-
-/// Service for update Date and Instant periodically at 500 millis interval.
-pub(crate) struct DateService {
-    current: Rc<Cell<(Date, Instant)>>,
-    handle: JoinHandle<()>,
-}
-
-impl DateService {
-    pub(crate) fn new() -> Self {
-        // shared date and timer for DateService and update async task.
-        let current = Rc::new(Cell::new((Date::new(), Instant::now())));
-        let current_clone = Rc::clone(&current);
-        // spawn an async task sleep for 500 millis and update current date/timer in a loop.
-        // handle is used to stop the task on DateService drop.
-        let handle = actix_rt::spawn(async move {
-            #[cfg(test)]
-            let _notify = crate::notify_on_drop::NotifyOnDrop::new();
-
-            let mut interval = interval(Duration::from_millis(500));
-            loop {
-                let now = interval.tick().await;
-                let date = Date::new();
-                current_clone.set((date, now.into_std()));
-            }
-        });
-
-        DateService { current, handle }
-    }
-
-    pub(crate) fn now(&self) -> Instant {
-        self.current.get().1
-    }
-
-    pub(crate) fn with_date<F: FnMut(&Date)>(&self, mut f: F) {
-        f(&self.current.get().0);
-    }
-}
-
-impl fmt::Debug for DateService {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("DateService").finish_non_exhaustive()
-    }
-}
-
-impl Drop for DateService {
-    fn drop(&mut self) {
-        // stop the timer update async task on drop.
-        self.handle.abort();
-    }
-}

actix-http/src/encoding/decoder.rs

@@ -9,28 +9,30 @@ use std::{
 
 use actix_rt::task::{spawn_blocking, JoinHandle};
 use bytes::Bytes;
+use futures_core::{ready, Stream};
+
+#[cfg(feature = "compress-brotli")]
+use brotli2::write::BrotliDecoder;
+
 #[cfg(feature = "compress-gzip")]
 use flate2::write::{GzDecoder, ZlibDecoder};
-use futures_core::{ready, Stream};
+
 #[cfg(feature = "compress-zstd")]
 use zstd::stream::write::Decoder as ZstdDecoder;
 
 use crate::{
     encoding::Writer,
-    error::PayloadError,
+    error::{BlockingError, PayloadError},
-    header::{ContentEncoding, HeaderMap, CONTENT_ENCODING},
+    http::header::{ContentEncoding, HeaderMap, CONTENT_ENCODING},
 };
 
 const MAX_CHUNK_SIZE_DECODE_IN_PLACE: usize = 2049;
 
-pin_project_lite::pin_project! {
+pub struct Decoder<S> {
-    pub struct Decoder<S> {
     decoder: Option<ContentDecoder>,
-        #[pin]
     stream: S,
     eof: bool,
     fut: Option<JoinHandle<Result<(Option<Bytes>, ContentDecoder), io::Error>>>,
-    }
 }
 
 impl<S> Decoder<S>
@@ -42,20 +44,17 @@ where
     pub fn new(stream: S, encoding: ContentEncoding) -> Decoder<S> {
         let decoder = match encoding {
             #[cfg(feature = "compress-brotli")]
-            ContentEncoding::Brotli => Some(ContentDecoder::Brotli(Box::new(
+            ContentEncoding::Br => Some(ContentDecoder::Br(Box::new(
-                brotli::DecompressorWriter::new(Writer::new(), 8_096),
+                BrotliDecoder::new(Writer::new()),
             ))),
-
             #[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(
+            ContentEncoding::Gzip => Some(ContentDecoder::Gzip(Box::new(
-                Writer::new(),
+                GzDecoder::new(Writer::new()),
-            )))),
+            ))),
-
             #[cfg(feature = "compress-zstd")]
             ContentEncoding::Zstd => Some(ContentDecoder::Zstd(Box::new(
                 ZstdDecoder::new(Writer::new()).expect(
@@ -90,48 +89,45 @@ where
 
 impl<S> Stream for Decoder<S>
 where
-    S: Stream<Item = Result<Bytes, PayloadError>>,
+    S: Stream<Item = Result<Bytes, PayloadError>> + Unpin,
 {
     type Item = Result<Bytes, PayloadError>;
 
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+    fn poll_next(
-        let mut this = self.project();
+        mut self: Pin<&mut Self>,
-
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Self::Item>> {
         loop {
-            if let Some(ref mut fut) = this.fut {
+            if let Some(ref mut fut) = self.fut {
-                let (chunk, decoder) = ready!(Pin::new(fut).poll(cx)).map_err(|_| {
+                let (chunk, decoder) =
-                    PayloadError::Io(io::Error::new(
+                    ready!(Pin::new(fut).poll(cx)).map_err(|_| BlockingError)??;
-                        io::ErrorKind::Other,
-                        "Blocking task was cancelled unexpectedly",
-                    ))
-                })??;
 
-                *this.decoder = Some(decoder);
+                self.decoder = Some(decoder);
-                this.fut.take();
+                self.fut.take();
 
                 if let Some(chunk) = chunk {
                     return Poll::Ready(Some(Ok(chunk)));
                 }
             }
 
-            if *this.eof {
+            if self.eof {
                 return Poll::Ready(None);
             }
 
-            match ready!(this.stream.as_mut().poll_next(cx)) {
+            match ready!(Pin::new(&mut self.stream).poll_next(cx)) {
                 Some(Err(err)) => return Poll::Ready(Some(Err(err))),
 
                 Some(Ok(chunk)) => {
-                    if let Some(mut decoder) = this.decoder.take() {
+                    if let Some(mut decoder) = self.decoder.take() {
                         if chunk.len() < MAX_CHUNK_SIZE_DECODE_IN_PLACE {
                             let chunk = decoder.feed_data(chunk)?;
-                            *this.decoder = Some(decoder);
+                            self.decoder = Some(decoder);
 
                             if let Some(chunk) = chunk {
                                 return Poll::Ready(Some(Ok(chunk)));
                             }
                         } else {
-                            *this.fut = Some(spawn_blocking(move || {
+                            self.fut = Some(spawn_blocking(move || {
                                 let chunk = decoder.feed_data(chunk)?;
                                 Ok((chunk, decoder))
                             }));
@@ -144,9 +140,9 @@ where
                 }
 
                 None => {
-                    *this.eof = true;
+                    self.eof = true;
 
-                    return if let Some(mut decoder) = this.decoder.take() {
+                    return if let Some(mut decoder) = self.decoder.take() {
                         match decoder.feed_eof() {
                             Ok(Some(res)) => Poll::Ready(Some(Ok(res))),
                             Ok(None) => Poll::Ready(None),
@@ -164,13 +160,10 @@ where
 enum ContentDecoder {
     #[cfg(feature = "compress-gzip")]
     Deflate(Box<ZlibDecoder<Writer>>),
-
     #[cfg(feature = "compress-gzip")]
     Gzip(Box<GzDecoder<Writer>>),
-
     #[cfg(feature = "compress-brotli")]
-    Brotli(Box<brotli::DecompressorWriter<Writer>>),
+    Br(Box<BrotliDecoder<Writer>>),
-
     // We need explicit 'static lifetime here because ZstdDecoder need lifetime
     // argument, and we use `spawn_blocking` in `Decoder::poll_next` that require `FnOnce() -> R + Send + 'static`
     #[cfg(feature = "compress-zstd")]
@@ -181,7 +174,7 @@ impl ContentDecoder {
     fn feed_eof(&mut self) -> io::Result<Option<Bytes>> {
         match self {
             #[cfg(feature = "compress-brotli")]
-            ContentDecoder::Brotli(ref mut decoder) => match decoder.flush() {
+            ContentDecoder::Br(ref mut decoder) => match decoder.flush() {
                 Ok(()) => {
                     let b = decoder.get_mut().take();
 
@@ -191,7 +184,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -205,7 +198,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -218,7 +211,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-zstd")]
@@ -231,7 +224,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
         }
     }
@@ -239,7 +232,7 @@ impl ContentDecoder {
     fn feed_data(&mut self, data: Bytes) -> io::Result<Option<Bytes>> {
         match self {
             #[cfg(feature = "compress-brotli")]
-            ContentDecoder::Brotli(ref mut decoder) => match decoder.write_all(&data) {
+            ContentDecoder::Br(ref mut decoder) => match decoder.write_all(&data) {
                 Ok(_) => {
                     decoder.flush()?;
                     let b = decoder.get_mut().take();
@@ -250,7 +243,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -265,7 +258,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-gzip")]
@@ -280,7 +273,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
 
             #[cfg(feature = "compress-zstd")]
@@ -295,7 +288,7 @@ impl ContentDecoder {
                         Ok(None)
                     }
                 }
-                Err(err) => Err(err),
+                Err(e) => Err(e),
             },
         }
     }

actix-http/src/encoding/encoder.rs

@@ -11,116 +11,105 @@ use std::{
 use actix_rt::task::{spawn_blocking, JoinHandle};
 use bytes::Bytes;
 use derive_more::Display;
+use futures_core::ready;
+use pin_project::pin_project;
+
+#[cfg(feature = "compress-brotli")]
+use brotli2::write::BrotliEncoder;
+
 #[cfg(feature = "compress-gzip")]
 use flate2::write::{GzEncoder, ZlibEncoder};
-use futures_core::ready;
+
-use pin_project_lite::pin_project;
-use tracing::trace;
 #[cfg(feature = "compress-zstd")]
 use zstd::stream::write::Encoder as ZstdEncoder;
 
-use super::Writer;
 use crate::{
-    body::{self, BodySize, MessageBody},
+    body::{AnyBody, BodySize, MessageBody},
-    header::{self, ContentEncoding, HeaderValue, CONTENT_ENCODING},
+    http::{
-    ResponseHead, StatusCode,
+        header::{ContentEncoding, CONTENT_ENCODING},
+        HeaderValue, StatusCode,
+    },
+    ResponseHead,
 };
 
+use super::Writer;
+use crate::error::BlockingError;
+
 const MAX_CHUNK_SIZE_ENCODE_IN_PLACE: usize = 1024;
 
-pin_project! {
+#[pin_project]
-    pub struct Encoder<B> {
+pub struct Encoder<B> {
+    eof: bool,
     #[pin]
     body: EncoderBody<B>,
     encoder: Option<ContentEncoder>,
     fut: Option<JoinHandle<Result<ContentEncoder, io::Error>>>,
-        eof: bool,
-    }
 }
 
 impl<B: MessageBody> Encoder<B> {
-    fn none() -> Self {
+    pub fn response(
-        Encoder {
+        encoding: ContentEncoding,
-            body: EncoderBody::None {
+        head: &mut ResponseHead,
-                body: body::None::new(),
+        body: AnyBody<B>,
-            },
+    ) -> AnyBody<Encoder<B>> {
-            encoder: None,
+        let can_encode = !(head.headers().contains_key(&CONTENT_ENCODING)
-            fut: None,
-            eof: true,
-        }
-    }
-
-    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
-        match body.size() {
-            BodySize::None => return Self::none(),
-            BodySize::Sized(0) => return Self::empty(),
-            _ => {}
-        }
-
-        let should_encode = !(head.headers().contains_key(&CONTENT_ENCODING)
             || head.status == StatusCode::SWITCHING_PROTOCOLS
             || head.status == StatusCode::NO_CONTENT
-            || encoding == ContentEncoding::Identity);
+            || encoding == ContentEncoding::Identity
+            || encoding == ContentEncoding::Auto);
 
-        let body = match body.try_into_bytes() {
+        let body = match body {
-            Ok(body) => EncoderBody::Full { body },
+            AnyBody::None => return AnyBody::None,
-            Err(body) => EncoderBody::Stream { body },
+            AnyBody::Bytes(buf) => {
+                if can_encode {
+                    EncoderBody::Bytes(buf)
+                } else {
+                    return AnyBody::Bytes(buf);
+                }
+            }
+            AnyBody::Body(body) => EncoderBody::Stream(body),
         };
 
-        if should_encode {
+        if can_encode {
-            // wrap body only if encoder is feature-enabled
+            // Modify response body only if encoder is not None
-            if let Some(enc) = ContentEncoder::select(encoding) {
+            if let Some(enc) = ContentEncoder::encoder(encoding) {
                 update_head(encoding, head);
+                head.no_chunking(false);
 
-                return Encoder {
+                return AnyBody::Body(Encoder {
                     body,
+                    eof: false,
+                    fut: None,
                     encoder: Some(enc),
-                    fut: None,
+                });
-                    eof: false,
-                };
             }
         }
 
-        Encoder {
+        AnyBody::Body(Encoder {
             body,
-            encoder: None,
-            fut: None,
             eof: false,
-        }
+            fut: None,
+            encoder: None,
+        })
     }
 }
 
-pin_project! {
+#[pin_project(project = EncoderBodyProj)]
-    #[project = EncoderBodyProj]
+enum EncoderBody<B> {
-    enum EncoderBody<B> {
+    Bytes(Bytes),
-        None { body: body::None },
+    Stream(#[pin] B),
-        Full { body: Bytes },
-        Stream { #[pin] body: B },
-    }
 }
 
 impl<B> MessageBody for EncoderBody<B>
 where
     B: MessageBody,
 {
-    type Error = EncoderError;
+    type Error = EncoderError<B::Error>;
 
-    #[inline]
     fn size(&self) -> BodySize {
         match self {
-            EncoderBody::None { body } => body.size(),
+            EncoderBody::Bytes(ref b) => b.size(),
-            EncoderBody::Full { body } => body.size(),
+            EncoderBody::Stream(ref b) => b.size(),
-            EncoderBody::Stream { body } => body.size(),
         }
     }
 
@@ -129,27 +118,14 @@ where
         cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         match self.project() {
-            EncoderBodyProj::None { body } => {
+            EncoderBodyProj::Bytes(b) => {
-                Pin::new(body).poll_next(cx).map_err(|err| match err {})
+                if b.is_empty() {
-            }
+                    Poll::Ready(None)
-            EncoderBodyProj::Full { body } => {
+                } else {
-                Pin::new(body).poll_next(cx).map_err(|err| match err {})
+                    Poll::Ready(Some(Ok(std::mem::take(b))))
-            }
-            EncoderBodyProj::Stream { body } => body
-                .poll_next(cx)
-                .map_err(|err| EncoderError::Body(err.into())),
                 }
             }
-
+            EncoderBodyProj::Stream(b) => b.poll_next(cx).map_err(EncoderError::Body),
-    #[inline]
-    fn try_into_bytes(self) -> Result<Bytes, Self>
-    where
-        Self: Sized,
-    {
-        match self {
-            EncoderBody::None { body } => Ok(body.try_into_bytes().unwrap()),
-            EncoderBody::Full { body } => Ok(body.try_into_bytes().unwrap()),
-            _ => Err(self),
         }
     }
 }
@@ -158,14 +134,13 @@ impl<B> MessageBody for Encoder<B>
 where
     B: MessageBody,
 {
-    type Error = EncoderError;
+    type Error = EncoderError<B::Error>;
 
-    #[inline]
     fn size(&self) -> BodySize {
-        if self.encoder.is_some() {
+        if self.encoder.is_none() {
-            BodySize::Stream
-        } else {
             self.body.size()
+        } else {
+            BodySize::Stream
         }
     }
 
@@ -174,7 +149,6 @@ where
         cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, Self::Error>>> {
         let mut this = self.project();
-
         loop {
             if *this.eof {
                 return Poll::Ready(None);
@@ -182,12 +156,7 @@ where
 
             if let Some(ref mut fut) = this.fut {
                 let mut encoder = ready!(Pin::new(fut).poll(cx))
-                    .map_err(|_| {
+                    .map_err(|_| EncoderError::Blocking(BlockingError))?
-                        EncoderError::Io(io::Error::new(
-                            io::ErrorKind::Other,
-                            "Blocking task was cancelled unexpectedly",
-                        ))
-                    })?
                     .map_err(EncoderError::Io)?;
 
                 let chunk = encoder.take();
@@ -228,7 +197,6 @@ where
                 None => {
                     if let Some(encoder) = this.encoder.take() {
                         let chunk = encoder.finish().map_err(EncoderError::Io)?;
-
                         if chunk.is_empty() {
                             return Poll::Ready(None);
                         } else {
@@ -242,75 +210,50 @@ where
             }
         }
     }
-
-    #[inline]
-    fn try_into_bytes(mut self) -> Result<Bytes, Self>
-    where
-        Self: Sized,
-    {
-        if self.encoder.is_some() {
-            Err(self)
-        } else {
-            match self.body.try_into_bytes() {
-                Ok(body) => Ok(body),
-                Err(body) => {
-                    self.body = body;
-                    Err(self)
-                }
-            }
-        }
-    }
 }
 
 fn update_head(encoding: ContentEncoding, head: &mut ResponseHead) {
-    head.headers_mut()
+    head.headers_mut().insert(
-        .insert(header::CONTENT_ENCODING, encoding.to_header_value());
+        CONTENT_ENCODING,
-    head.headers_mut()
+        HeaderValue::from_static(encoding.as_str()),
-        .append(header::VARY, HeaderValue::from_static("accept-encoding"));
+    );
-
-    head.no_chunking(false);
 }
 
 enum ContentEncoder {
     #[cfg(feature = "compress-gzip")]
     Deflate(ZlibEncoder<Writer>),
-
     #[cfg(feature = "compress-gzip")]
     Gzip(GzEncoder<Writer>),
-
     #[cfg(feature = "compress-brotli")]
-    Brotli(Box<brotli::CompressorWriter<Writer>>),
+    Br(BrotliEncoder<Writer>),
-
+    // We need explicit 'static lifetime here because ZstdEncoder need lifetime
-    // Wwe need explicit 'static lifetime here because ZstdEncoder needs a lifetime argument and we
+    // argument, and we use `spawn_blocking` in `Encoder::poll_next` that require `FnOnce() -> R + Send + 'static`
-    // use `spawn_blocking` in `Encoder::poll_next` that requires `FnOnce() -> R + Send + 'static`.
     #[cfg(feature = "compress-zstd")]
     Zstd(ZstdEncoder<'static, Writer>),
 }
 
 impl ContentEncoder {
-    fn select(encoding: ContentEncoding) -> Option<Self> {
+    fn encoder(encoding: ContentEncoding) -> Option<Self> {
         match encoding {
             #[cfg(feature = "compress-gzip")]
             ContentEncoding::Deflate => Some(ContentEncoder::Deflate(ZlibEncoder::new(
                 Writer::new(),
                 flate2::Compression::fast(),
             ))),
-
             #[cfg(feature = "compress-gzip")]
             ContentEncoding::Gzip => Some(ContentEncoder::Gzip(GzEncoder::new(
                 Writer::new(),
                 flate2::Compression::fast(),
             ))),
-
             #[cfg(feature = "compress-brotli")]
-            ContentEncoding::Brotli => Some(ContentEncoder::Brotli(new_brotli_compressor())),
+            ContentEncoding::Br => {
-
+                Some(ContentEncoder::Br(BrotliEncoder::new(Writer::new(), 3)))
+            }
             #[cfg(feature = "compress-zstd")]
             ContentEncoding::Zstd => {
                 let encoder = ZstdEncoder::new(Writer::new(), 3).ok()?;
                 Some(ContentEncoder::Zstd(encoder))
             }
-
             _ => None,
         }
     }
@@ -319,14 +262,11 @@ impl ContentEncoder {
     pub(crate) fn take(&mut self) -> Bytes {
         match *self {
             #[cfg(feature = "compress-brotli")]
-            ContentEncoder::Brotli(ref mut encoder) => encoder.get_mut().take(),
+            ContentEncoder::Br(ref mut encoder) => encoder.get_mut().take(),
-
             #[cfg(feature = "compress-gzip")]
             ContentEncoder::Deflate(ref mut encoder) => encoder.get_mut().take(),
-
             #[cfg(feature = "compress-gzip")]
             ContentEncoder::Gzip(ref mut encoder) => encoder.get_mut().take(),
-
             #[cfg(feature = "compress-zstd")]
             ContentEncoder::Zstd(ref mut encoder) => encoder.get_mut().take(),
         }
@@ -335,23 +275,20 @@ impl ContentEncoder {
     fn finish(self) -> Result<Bytes, io::Error> {
         match self {
             #[cfg(feature = "compress-brotli")]
-            ContentEncoder::Brotli(mut encoder) => match encoder.flush() {
+            ContentEncoder::Br(encoder) => match encoder.finish() {
-                Ok(()) => Ok(encoder.into_inner().buf.freeze()),
+                Ok(writer) => Ok(writer.buf.freeze()),
                 Err(err) => Err(err),
             },
-
             #[cfg(feature = "compress-gzip")]
             ContentEncoder::Gzip(encoder) => match encoder.finish() {
                 Ok(writer) => Ok(writer.buf.freeze()),
                 Err(err) => Err(err),
             },
-
             #[cfg(feature = "compress-gzip")]
             ContentEncoder::Deflate(encoder) => match encoder.finish() {
                 Ok(writer) => Ok(writer.buf.freeze()),
                 Err(err) => Err(err),
             },
-
             #[cfg(feature = "compress-zstd")]
             ContentEncoder::Zstd(encoder) => match encoder.finish() {
                 Ok(writer) => Ok(writer.buf.freeze()),
@@ -363,14 +300,13 @@ impl ContentEncoder {
     fn write(&mut self, data: &[u8]) -> Result<(), io::Error> {
         match *self {
             #[cfg(feature = "compress-brotli")]
-            ContentEncoder::Brotli(ref mut encoder) => match encoder.write_all(data) {
+            ContentEncoder::Br(ref mut encoder) => match encoder.write_all(data) {
                 Ok(_) => Ok(()),
                 Err(err) => {
                     trace!("Error decoding br encoding: {}", err);
                     Err(err)
                 }
             },
-
             #[cfg(feature = "compress-gzip")]
             ContentEncoder::Gzip(ref mut encoder) => match encoder.write_all(data) {
                 Ok(_) => Ok(()),
@@ -379,7 +315,6 @@ impl ContentEncoder {
                     Err(err)
                 }
             },
-
             #[cfg(feature = "compress-gzip")]
             ContentEncoder::Deflate(ref mut encoder) => match encoder.write_all(data) {
                 Ok(_) => Ok(()),
@@ -388,7 +323,6 @@ impl ContentEncoder {
                     Err(err)
                 }
             },
-
             #[cfg(feature = "compress-zstd")]
             ContentEncoder::Zstd(ref mut encoder) => match encoder.write_all(data) {
                 Ok(_) => Ok(()),
@@ -401,39 +335,31 @@ impl ContentEncoder {
     }
 }
 
-#[cfg(feature = "compress-brotli")]
-fn new_brotli_compressor() -> Box<brotli::CompressorWriter<Writer>> {
-    Box::new(brotli::CompressorWriter::new(
-        Writer::new(),
-        32 * 1024, // 32 KiB buffer
-        3,         // BROTLI_PARAM_QUALITY
-        22,        // BROTLI_PARAM_LGWIN
-    ))
-}
-
 #[derive(Debug, Display)]
 #[non_exhaustive]
-pub enum EncoderError {
+pub enum EncoderError<E> {
-    /// Wrapped body stream error.
+    #[display(fmt = "body")]
-    #[display("body")]
+    Body(E),
-    Body(Box<dyn StdError>),
 
-    /// Generic I/O error.
+    #[display(fmt = "blocking")]
-    #[display("io")]
+    Blocking(BlockingError),
+
+    #[display(fmt = "io")]
     Io(io::Error),
 }
 
-impl StdError for EncoderError {
+impl<E: StdError + 'static> StdError for EncoderError<E> {
     fn source(&self) -> Option<&(dyn StdError + 'static)> {
         match self {
-            EncoderError::Body(err) => Some(&**err),
+            EncoderError::Body(err) => Some(err),
+            EncoderError::Blocking(err) => Some(err),
             EncoderError::Io(err) => Some(err),
         }
     }
 }
 
-impl From<EncoderError> for crate::Error {
+impl<E: StdError + 'static> From<EncoderError<E>> for crate::Error {
-    fn from(err: EncoderError) -> Self {
+    fn from(err: EncoderError<E>) -> Self {
         crate::Error::new_encoder().with_cause(err)
     }
 }

actix-http/src/encoding/mod.rs

@@ -7,12 +7,10 @@ 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.
+pub(self) struct Writer {
-///
-/// Pre-allocates 8KiB of capacity.
-struct Writer {
     buf: BytesMut,
 }
 

actix-http/src/error.rs

@@ -3,10 +3,11 @@
 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};
+use crate::{body::AnyBody, ws, Response};
+
+pub use http::Error as HttpError;
 
 pub struct Error {
     inner: Box<ErrorInner>,
@@ -50,7 +51,7 @@ impl Error {
         Self::new(Kind::SendResponse)
     }
 
-    #[allow(unused)] // available for future use
+    #[allow(unused)] // reserved for future use (TODO: remove allow when being used)
     pub(crate) fn new_io() -> Self {
         Self::new(Kind::Io)
     }
@@ -60,57 +61,53 @@ impl Error {
         Self::new(Kind::Encoder)
     }
 
-    #[allow(unused)] // used with `ws` feature flag
     pub(crate) fn new_ws() -> Self {
         Self::new(Kind::Ws)
     }
 }
 
-impl From<Error> for Response<BoxBody> {
+impl<B> From<Error> for Response<AnyBody<B>> {
     fn from(err: Error) -> Self {
-        // TODO: more appropriate error status codes, usage assessment needed
         let status_code = match err.inner.kind {
             Kind::Parse => StatusCode::BAD_REQUEST,
             _ => StatusCode::INTERNAL_SERVER_ERROR,
         };
 
-        Response::new(status_code).set_body(BoxBody::new(err.to_string()))
+        Response::new(status_code).set_body(AnyBody::from(err.to_string()))
     }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Display)]
 pub(crate) enum Kind {
-    #[display("error processing HTTP")]
+    #[display(fmt = "error processing HTTP")]
     Http,
 
-    #[display("error parsing HTTP message")]
+    #[display(fmt = "error parsing HTTP message")]
     Parse,
 
-    #[display("request payload read error")]
+    #[display(fmt = "request payload read error")]
     Payload,
 
-    #[display("response body write error")]
+    #[display(fmt = "response body write error")]
     Body,
 
-    #[display("send response error")]
+    #[display(fmt = "send response error")]
     SendResponse,
 
-    #[display("error in WebSocket process")]
+    #[display(fmt = "error in WebSocket process")]
     Ws,
 
-    #[display("connection error")]
+    #[display(fmt = "connection error")]
     Io,
 
-    #[display("encoder error")]
+    #[display(fmt = "encoder error")]
     Encoder,
 }
 
 impl fmt::Debug for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("actix_http::Error")
+        // TODO: more detail
-            .field("kind", &self.inner.kind)
+        f.write_str("actix_http::Error")
-            .field("cause", &self.inner.cause)
-            .finish()
     }
 }
 
@@ -135,22 +132,20 @@ impl From<std::convert::Infallible> for Error {
     }
 }
 
+impl From<ws::ProtocolError> for Error {
+    fn from(err: ws::ProtocolError) -> Self {
+        Self::new_ws().with_cause(err)
+    }
+}
+
 impl From<HttpError> for Error {
     fn from(err: HttpError) -> Self {
         Self::new_http().with_cause(err)
     }
 }
 
-#[cfg(feature = "ws")]
+impl From<ws::HandshakeError> for Error {
-impl From<crate::ws::HandshakeError> for Error {
+    fn from(err: ws::HandshakeError) -> Self {
-    fn from(err: crate::ws::HandshakeError) -> Self {
-        Self::new_ws().with_cause(err)
-    }
-}
-
-#[cfg(feature = "ws")]
-impl From<crate::ws::ProtocolError> for Error {
-    fn from(err: crate::ws::ProtocolError) -> Self {
         Self::new_ws().with_cause(err)
     }
 }
@@ -160,44 +155,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),
 }
 
@@ -245,39 +240,46 @@ impl From<ParseError> for Error {
     }
 }
 
-impl From<ParseError> for Response<BoxBody> {
+impl From<ParseError> for Response<AnyBody> {
     fn from(err: ParseError) -> Self {
         Error::from(err).into()
     }
 }
 
+/// A set of errors that can occur running blocking tasks in thread pool.
+#[derive(Debug, Display, Error)]
+#[display(fmt = "Blocking thread pool is gone")]
+pub struct BlockingError;
+
 /// A set of errors that can occur during payload parsing.
 #[derive(Debug, Display)]
 #[non_exhaustive]
 pub enum PayloadError {
     /// A payload reached EOF, but is not complete.
-    #[display("payload reached EOF before completing: {:?}", _0)]
+    #[display(
+        fmt = "A payload reached EOF, but is not complete. Inner error: {:?}",
+        _0
+    )]
     Incomplete(Option<io::Error>),
 
     /// Content encoding stream corruption.
-    #[display("can not decode content-encoding")]
+    #[display(fmt = "Can not decode content-encoding.")]
     EncodingCorrupted,
 
     /// Payload reached size limit.
-    #[display("payload reached size limit")]
+    #[display(fmt = "Payload reached size limit.")]
     Overflow,
 
     /// Payload length is unknown.
-    #[display("payload length is unknown")]
+    #[display(fmt = "Payload length is unknown.")]
     UnknownLength,
 
     /// HTTP/2 payload error.
-    #[cfg(feature = "http2")]
+    #[display(fmt = "{}", _0)]
-    #[display("{}", _0)]
+    Http2Payload(h2::Error),
-    Http2Payload(::h2::Error),
 
     /// Generic I/O error.
-    #[display("{}", _0)]
+    #[display(fmt = "{}", _0)]
     Io(io::Error),
 }
 
@@ -285,20 +287,18 @@ impl std::error::Error for PayloadError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
             PayloadError::Incomplete(None) => None,
-            PayloadError::Incomplete(Some(err)) => Some(err),
+            PayloadError::Incomplete(Some(err)) => Some(err as &dyn std::error::Error),
             PayloadError::EncodingCorrupted => None,
             PayloadError::Overflow => None,
             PayloadError::UnknownLength => None,
-            #[cfg(feature = "http2")]
+            PayloadError::Http2Payload(err) => Some(err as &dyn std::error::Error),
-            PayloadError::Http2Payload(err) => Some(err),
+            PayloadError::Io(err) => Some(err as &dyn std::error::Error),
-            PayloadError::Io(err) => Some(err),
         }
     }
 }
 
-#[cfg(feature = "http2")]
+impl From<h2::Error> for PayloadError {
-impl From<::h2::Error> for PayloadError {
+    fn from(err: h2::Error) -> Self {
-    fn from(err: ::h2::Error) -> Self {
         PayloadError::Http2Payload(err)
     }
 }
@@ -315,6 +315,15 @@ impl From<io::Error> for PayloadError {
     }
 }
 
+impl From<BlockingError> for PayloadError {
+    fn from(_: BlockingError) -> Self {
+        PayloadError::Io(io::Error::new(
+            io::ErrorKind::Other,
+            "Operation is canceled",
+        ))
+    }
+}
+
 impl From<PayloadError> for Error {
     fn from(err: PayloadError) -> Self {
         Self::new_payload().with_cause(err)
@@ -322,94 +331,101 @@ impl From<PayloadError> for Error {
 }
 
 /// A set of errors that can occur during dispatching HTTP requests.
-#[derive(Debug, Display, From)]
+#[derive(Debug, Display, Error, From)]
 #[non_exhaustive]
 pub enum DispatchError {
-    /// Service error.
+    /// Service error
-    #[display("service error")]
+    // FIXME: display and error type
-    Service(Response<BoxBody>),
+    #[display(fmt = "Service Error")]
+    Service(#[error(not(source))] Response<AnyBody>),
 
-    /// Body streaming error.
+    /// Body error
-    #[display("body error: {}", _0)]
+    // FIXME: display and error type
-    Body(Box<dyn StdError>),
+    #[display(fmt = "Body Error")]
+    Body(#[error(not(source))] Box<dyn StdError>),
 
-    /// Upgrade service error.
+    /// 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.
+    /// Http request parse error.
-    #[display("request parse error: {}", _0)]
+    #[display(fmt = "Parse error: {}", _0)]
     Parse(ParseError),
 
-    /// HTTP/2 error.
+    /// Http/2 error
-    #[display("{}", _0)]
+    #[display(fmt = "{}", _0)]
-    #[cfg(feature = "http2")]
     H2(h2::Error),
 
     /// The first request did not complete within the specified timeout.
-    #[display("request did not complete within the specified timeout")]
+    #[display(fmt = "The first request did not complete within the specified timeout")]
     SlowRequestTimeout,
 
-    /// Disconnect timeout. Makes sense for TLS streams.
+    /// Disconnect timeout. Makes sense for ssl streams.
-    #[display("connection shutdown timeout")]
+    #[display(fmt = "Connection shutdown timeout")]
     DisconnectTimeout,
 
-    /// Handler dropped payload before reading EOF.
+    /// Payload is not consumed
-    #[display("handler dropped payload before reading EOF")]
+    #[display(fmt = "Task is completed but request's payload is not consumed")]
-    HandlerDroppedPayload,
+    PayloadIsNotConsumed,
 
-    /// Internal error.
+    /// Malformed request
-    #[display("internal error")]
+    #[display(fmt = "Malformed request")]
+    MalformedRequest,
+
+    /// Internal error
+    #[display(fmt = "Internal error")]
     InternalError,
-}
 
-impl StdError for DispatchError {
+    /// Unknown error
-    fn source(&self) -> Option<&(dyn StdError + 'static)> {
+    #[display(fmt = "Unknown error")]
-        match self {
+    Unknown,
-            DispatchError::Service(_res) => None,
-            DispatchError::Body(err) => Some(&**err),
-            DispatchError::Io(err) => Some(err),
-            DispatchError::Parse(err) => Some(err),
-
-            #[cfg(feature = "http2")]
-            DispatchError::H2(err) => Some(err),
-
-            _ => None,
-        }
-    }
 }
 
 /// A set of error that can occur during parsing content type.
 #[derive(Debug, Display, Error)]
-#[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 {
+mod content_type_test_impls {
-    use http::Error as HttpError;
-
     use super::*;
 
+    impl std::cmp::PartialEq for ContentTypeError {
+        fn eq(&self, other: &Self) -> bool {
+            match self {
+                Self::ParseError => matches!(other, ContentTypeError::ParseError),
+                Self::UnknownEncoding => {
+                    matches!(other, ContentTypeError::UnknownEncoding)
+                }
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use http::{Error as HttpError, StatusCode};
+    use std::io;
+
     #[test]
     fn test_into_response() {
-        let resp: Response<BoxBody> = ParseError::Incomplete.into();
+        let resp: Response<AnyBody> = ParseError::Incomplete.into();
         assert_eq!(resp.status(), StatusCode::BAD_REQUEST);
 
         let err: HttpError = StatusCode::from_u16(10000).err().unwrap().into();
-        let resp: Response<BoxBody> = Error::new_http().with_cause(err).into();
+        let resp: Response<AnyBody> = Error::new_http().with_cause(err).into();
         assert_eq!(resp.status(), StatusCode::INTERNAL_SERVER_ERROR);
     }
 
@@ -419,7 +435,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"
         );
     }
 
@@ -434,19 +450,20 @@ mod tests {
     fn test_error_http_response() {
         let orig = io::Error::new(io::ErrorKind::Other, "other");
         let err = Error::new_io().with_cause(orig);
-        let resp: Response<BoxBody> = err.into();
+        let resp: Response<AnyBody> = err.into();
         assert_eq!(resp.status(), StatusCode::INTERNAL_SERVER_ERROR);
     }
 
     #[test]
     fn test_payload_error() {
-        let err: PayloadError = io::Error::new(io::ErrorKind::Other, "ParseError").into();
+        let err: PayloadError =
+            io::Error::new(io::ErrorKind::Other, "ParseError").into();
         assert!(err.to_string().contains("ParseError"));
 
         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 +483,7 @@ mod tests {
             match ParseError::from($from) {
                 e @ $error => {
                     let desc = format!("{}", e);
-                    assert_eq!(desc, format!("I/O error: {}", $from));
+                    assert_eq!(desc, format!("IO error: {}", $from));
                 }
                 _ => unreachable!("{:?}", $from),
             }

actix-http/src/extensions.rs

@@ -1,38 +1,18 @@
 use std::{
     any::{Any, TypeId},
-    collections::HashMap,
+    fmt, mem,
-    fmt,
-    hash::{BuildHasherDefault, Hasher},
 };
 
-/// A hasher for `TypeId`s that takes advantage of its known characteristics.
+use ahash::AHashMap;
-///
-/// Author of `anymap` crate has done research on the topic:
-/// https://github.com/chris-morgan/anymap/blob/2e9a5704/src/lib.rs#L599
-#[derive(Debug, Default)]
-struct NoOpHasher(u64);
-
-impl Hasher for NoOpHasher {
-    fn write(&mut self, _bytes: &[u8]) {
-        unimplemented!("This NoOpHasher can only handle u64s")
-    }
-
-    fn write_u64(&mut self, i: u64) {
-        self.0 = i;
-    }
-
-    fn finish(&self) -> u64 {
-        self.0
-    }
-}
 
 /// A type map for request extensions.
 ///
 /// All entries into this map must be owned types (or static references).
 #[derive(Default)]
 pub struct Extensions {
-    // use no-op hasher with a std HashMap with for faster lookups on the small `TypeId` keys
+    /// Use FxHasher with a std HashMap with for faster
-    map: HashMap<TypeId, Box<dyn Any>, BuildHasherDefault<NoOpHasher>>,
+    /// lookups on the small `TypeId` (u64 equivalent) keys.
+    map: AHashMap<TypeId, Box<dyn Any>>,
 }
 
 impl Extensions {
@@ -40,7 +20,7 @@ impl Extensions {
     #[inline]
     pub fn new() -> Extensions {
         Extensions {
-            map: HashMap::default(),
+            map: AHashMap::default(),
         }
     }
 
@@ -104,46 +84,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.
@@ -183,6 +123,11 @@ impl Extensions {
     pub fn extend(&mut self, other: Extensions) {
         self.map.extend(other.map);
     }
+
+    /// Sets (or overrides) items from `other` into this map.
+    pub(crate) fn drain_from(&mut self, other: &mut Self) {
+        self.map.extend(mem::take(&mut other.map));
+    }
 }
 
 impl fmt::Debug for Extensions {
@@ -234,8 +179,6 @@ mod tests {
 
     #[test]
     fn test_integers() {
-        static A: u32 = 8;
-
         let mut map = Extensions::new();
 
         map.insert::<i8>(8);
@@ -248,7 +191,6 @@ mod tests {
         map.insert::<u32>(32);
         map.insert::<u64>(64);
         map.insert::<u128>(128);
-        map.insert::<&'static u32>(&A);
         assert!(map.get::<i8>().is_some());
         assert!(map.get::<i16>().is_some());
         assert!(map.get::<i32>().is_some());
@@ -259,7 +201,6 @@ mod tests {
         assert!(map.get::<u32>().is_some());
         assert!(map.get::<u64>().is_some());
         assert!(map.get::<u128>().is_some());
-        assert!(map.get::<&'static u32>().is_some());
     }
 
     #[test]
@@ -338,4 +279,27 @@ mod tests {
         assert_eq!(extensions.get(), Some(&20u8));
         assert_eq!(extensions.get_mut(), Some(&mut 20u8));
     }
+
+    #[test]
+    fn test_drain_from() {
+        let mut ext = Extensions::new();
+        ext.insert(2isize);
+
+        let mut more_ext = Extensions::new();
+
+        more_ext.insert(5isize);
+        more_ext.insert(5usize);
+
+        assert_eq!(ext.get::<isize>(), Some(&2isize));
+        assert_eq!(ext.get::<usize>(), None);
+        assert_eq!(more_ext.get::<isize>(), Some(&5isize));
+        assert_eq!(more_ext.get::<usize>(), Some(&5usize));
+
+        ext.drain_from(&mut more_ext);
+
+        assert_eq!(ext.get::<isize>(), Some(&5isize));
+        assert_eq!(ext.get::<usize>(), Some(&5usize));
+        assert_eq!(more_ext.get::<isize>(), None);
+        assert_eq!(more_ext.get::<usize>(), None);
+    }
 }

actix-http/src/h1/chunked.rs

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

actix-http/src/h1/client.rs

@@ -1,25 +1,22 @@
-use std::{fmt, io};
+use std::io;
 
+use actix_codec::{Decoder, Encoder};
 use bitflags::bitflags;
 use bytes::{Bytes, BytesMut};
 use http::{Method, Version};
-use tokio_util::codec::{Decoder, Encoder};
 
-use super::{
+use super::decoder::{PayloadDecoder, PayloadItem, PayloadType};
-    decoder::{self, PayloadDecoder, PayloadItem, PayloadType},
+use super::{decoder, encoder, reserve_readbuf};
-    encoder, reserve_readbuf, Message, MessageType,
+use super::{Message, MessageType};
-};
+use crate::body::BodySize;
-use crate::{
+use crate::config::ServiceConfig;
-    body::BodySize,
+use crate::error::{ParseError, PayloadError};
-    error::{ParseError, PayloadError},
+use crate::message::{ConnectionType, RequestHeadType, ResponseHead};
-    ConnectionType, RequestHeadType, ResponseHead, ServiceConfig,
-};
 
 bitflags! {
-    #[derive(Debug, Clone, Copy)]
     struct Flags: u8 {
         const HEAD              = 0b0000_0001;
-        const KEEP_ALIVE_ENABLED = 0b0000_1000;
+        const KEEPALIVE_ENABLED = 0b0000_1000;
         const STREAM            = 0b0001_0000;
     }
 }
@@ -39,7 +36,7 @@ struct ClientCodecInner {
     decoder: decoder::MessageDecoder<ResponseHead>,
     payload: Option<PayloadDecoder>,
     version: Version,
-    conn_type: ConnectionType,
+    ctype: ConnectionType,
 
     // encoder part
     flags: Flags,
@@ -52,32 +49,23 @@ impl Default for ClientCodec {
     }
 }
 
-impl fmt::Debug for ClientCodec {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("h1::ClientCodec")
-            .field("flags", &self.inner.flags)
-            .finish_non_exhaustive()
-    }
-}
-
 impl ClientCodec {
     /// Create HTTP/1 codec.
     ///
     /// `keepalive_enabled` how response `connection` header get generated.
     pub fn new(config: ServiceConfig) -> Self {
-        let flags = if config.keep_alive().enabled() {
+        let flags = if config.keep_alive_enabled() {
-            Flags::KEEP_ALIVE_ENABLED
+            Flags::KEEPALIVE_ENABLED
         } else {
             Flags::empty()
         };
-
         ClientCodec {
             inner: ClientCodecInner {
                 config,
                 decoder: decoder::MessageDecoder::default(),
                 payload: None,
                 version: Version::HTTP_11,
-                conn_type: ConnectionType::Close,
+                ctype: ConnectionType::Close,
 
                 flags,
                 encoder: encoder::MessageEncoder::default(),
@@ -87,12 +75,12 @@ impl ClientCodec {
 
     /// Check if request is upgrade
     pub fn upgrade(&self) -> bool {
-        self.inner.conn_type == ConnectionType::Upgrade
+        self.inner.ctype == ConnectionType::Upgrade
     }
 
     /// Check if last response is keep-alive
-    pub fn keep_alive(&self) -> bool {
+    pub fn keepalive(&self) -> bool {
-        self.inner.conn_type == ConnectionType::KeepAlive
+        self.inner.ctype == ConnectionType::KeepAlive
     }
 
     /// Check last request's message type
@@ -114,8 +102,8 @@ impl ClientCodec {
 
 impl ClientPayloadCodec {
     /// Check if last response is keep-alive
-    pub fn keep_alive(&self) -> bool {
+    pub fn keepalive(&self) -> bool {
-        self.inner.conn_type == ConnectionType::KeepAlive
+        self.inner.ctype == ConnectionType::KeepAlive
     }
 
     /// Transform payload codec to a message codec
@@ -129,18 +117,15 @@ impl Decoder for ClientCodec {
     type Error = ParseError;
 
     fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
-        debug_assert!(
+        debug_assert!(!self.inner.payload.is_some(), "Payload decoder is set");
-            self.inner.payload.is_none(),
-            "Payload decoder should not be set"
-        );
 
         if let Some((req, payload)) = self.inner.decoder.decode(src)? {
-            if let Some(conn_type) = req.conn_type() {
+            if let Some(ctype) = req.conn_type() {
                 // do not use peer's keep-alive
-                self.inner.conn_type = if conn_type == ConnectionType::KeepAlive {
+                self.inner.ctype = if ctype == ConnectionType::KeepAlive {
-                    self.inner.conn_type
+                    self.inner.ctype
                 } else {
-                    conn_type
+                    ctype
                 };
             }
 
@@ -205,9 +190,9 @@ impl Encoder<Message<(RequestHeadType, BodySize)>> for ClientCodec {
                     .set(Flags::HEAD, head.as_ref().method == Method::HEAD);
 
                 // connection status
-                inner.conn_type = match head.as_ref().connection_type() {
+                inner.ctype = match head.as_ref().connection_type() {
                     ConnectionType::KeepAlive => {
-                        if inner.flags.contains(Flags::KEEP_ALIVE_ENABLED) {
+                        if inner.flags.contains(Flags::KEEPALIVE_ENABLED) {
                             ConnectionType::KeepAlive
                         } else {
                             ConnectionType::Close
@@ -224,7 +209,7 @@ impl Encoder<Message<(RequestHeadType, BodySize)>> for ClientCodec {
                     false,
                     inner.version,
                     length,
-                    inner.conn_type,
+                    inner.ctype,
                     &inner.config,
                 )?;
             }

actix-http/src/h1/codec.rs

@@ -1,21 +1,24 @@
 use std::{fmt, io};
 
+use actix_codec::{Decoder, Encoder};
 use bitflags::bitflags;
 use bytes::BytesMut;
 use http::{Method, Version};
-use tokio_util::codec::{Decoder, Encoder};
 
-use super::{
+use super::decoder::{PayloadDecoder, PayloadItem, PayloadType};
-    decoder::{self, PayloadDecoder, PayloadItem, PayloadType},
+use super::{decoder, encoder};
-    encoder, Message, MessageType,
+use super::{Message, MessageType};
-};
+use crate::body::BodySize;
-use crate::{body::BodySize, error::ParseError, ConnectionType, Request, Response, ServiceConfig};
+use crate::config::ServiceConfig;
+use crate::error::ParseError;
+use crate::message::ConnectionType;
+use crate::request::Request;
+use crate::response::Response;
 
 bitflags! {
-    #[derive(Debug, Clone, Copy)]
     struct Flags: u8 {
         const HEAD              = 0b0000_0001;
-        const KEEP_ALIVE_ENABLED = 0b0000_0010;
+        const KEEPALIVE_ENABLED = 0b0000_0010;
         const STREAM            = 0b0000_0100;
     }
 }
@@ -41,9 +44,7 @@ impl Default for Codec {
 
 impl fmt::Debug for Codec {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("h1::Codec")
+        write!(f, "h1::Codec({:?})", self.flags)
-            .field("flags", &self.flags)
-            .finish_non_exhaustive()
     }
 }
 
@@ -52,8 +53,8 @@ impl Codec {
     ///
     /// `keepalive_enabled` how response `connection` header get generated.
     pub fn new(config: ServiceConfig) -> Self {
-        let flags = if config.keep_alive().enabled() {
+        let flags = if config.keep_alive_enabled() {
-            Flags::KEEP_ALIVE_ENABLED
+            Flags::KEEPALIVE_ENABLED
         } else {
             Flags::empty()
         };
@@ -77,14 +78,14 @@ impl Codec {
 
     /// Check if last response is keep-alive.
     #[inline]
-    pub fn keep_alive(&self) -> bool {
+    pub fn keepalive(&self) -> bool {
         self.conn_type == ConnectionType::KeepAlive
     }
 
     /// Check if keep-alive enabled on server level.
     #[inline]
-    pub fn keep_alive_enabled(&self) -> bool {
+    pub fn keepalive_enabled(&self) -> bool {
-        self.flags.contains(Flags::KEEP_ALIVE_ENABLED)
+        self.flags.contains(Flags::KEEPALIVE_ENABLED)
     }
 
     /// Check last request's message type.
@@ -124,13 +125,11 @@ impl Decoder for Codec {
             self.flags.set(Flags::HEAD, head.method == Method::HEAD);
             self.version = head.version;
             self.conn_type = head.connection_type();
-
             if self.conn_type == ConnectionType::KeepAlive
-                && !self.flags.contains(Flags::KEEP_ALIVE_ENABLED)
+                && !self.flags.contains(Flags::KEEPALIVE_ENABLED)
             {
                 self.conn_type = ConnectionType::Close
             }
-
             match payload {
                 PayloadType::None => self.payload = None,
                 PayloadType::Payload(pl) => self.payload = Some(pl),
@@ -182,11 +181,9 @@ impl Encoder<Message<(Response<()>, BodySize)>> for Codec {
                     &self.config,
                 )?;
             }
-
             Message::Chunk(Some(bytes)) => {
                 self.encoder.encode_chunk(bytes.as_ref(), dst)?;
             }
-
             Message::Chunk(None) => {
                 self.encoder.encode_eof(dst)?;
             }
@@ -198,8 +195,11 @@ impl Encoder<Message<(Response<()>, BodySize)>> for Codec {
 
 #[cfg(test)]
 mod tests {
+    use bytes::BytesMut;
+    use http::Method;
+
     use super::*;
-    use crate::HttpMessage as _;
+    use crate::HttpMessage;
 
     #[actix_rt::test]
     async fn test_http_request_chunked_payload_and_next_message() {

actix-http/src/h1/decoder.rs

@@ -1,15 +1,18 @@
-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};
-use http::{
+use http::header::{HeaderName, HeaderValue};
-    header::{self, HeaderName, HeaderValue},
+use http::{header, Method, StatusCode, Uri, Version};
-    Method, StatusCode, Uri, Version,
+use log::{debug, error, trace};
-};
-use tracing::{debug, error, trace};
 
 use super::chunked::ChunkedState;
-use crate::{error::ParseError, header::HeaderMap, ConnectionType, Request, ResponseHead};
+use crate::{
+    error::ParseError,
+    header::HeaderMap,
+    message::{ConnectionType, ResponseHead},
+    request::Request,
+};
 
 pub(crate) const MAX_BUFFER_SIZE: usize = 131_072;
 const MAX_HEADERS: usize = 96;
@@ -46,25 +49,8 @@ pub(crate) enum PayloadLength {
     None,
 }
 
-impl PayloadLength {
-    /// Returns true if variant is `None`.
-    fn is_none(&self) -> bool {
-        matches!(self, Self::None)
-    }
-
-    /// Returns true if variant is represents zero-length (not none) payload.
-    fn is_zero(&self) -> bool {
-        matches!(
-            self,
-            PayloadLength::Payload(PayloadType::Payload(PayloadDecoder {
-                kind: Kind::Length(0)
-            }))
-        )
-    }
-}
-
 pub(crate) trait MessageType: Sized {
-    fn set_connection_type(&mut self, conn_type: Option<ConnectionType>);
+    fn set_connection_type(&mut self, ctype: Option<ConnectionType>);
 
     fn set_expect(&mut self);
 
@@ -76,7 +62,6 @@ pub(crate) trait MessageType: Sized {
         &mut self,
         slice: &Bytes,
         raw_headers: &[HeaderIndex],
-        version: Version,
     ) -> Result<PayloadLength, ParseError> {
         let mut ka = None;
         let mut has_upgrade_websocket = false;
@@ -89,12 +74,15 @@ pub(crate) trait MessageType: Sized {
             let headers = self.headers_mut();
 
             for idx in raw_headers.iter() {
-                let name = HeaderName::from_bytes(&slice[idx.name.0..idx.name.1]).unwrap();
+                let name =
+                    HeaderName::from_bytes(&slice[idx.name.0..idx.name.1]).unwrap();
 
                 // SAFETY: httparse already checks header value is only visible ASCII bytes
                 // from_maybe_shared_unchecked contains debug assertions so they are omitted here
                 let value = unsafe {
-                    HeaderValue::from_maybe_shared_unchecked(slice.slice(idx.value.0..idx.value.1))
+                    HeaderValue::from_maybe_shared_unchecked(
+                        slice.slice(idx.value.0..idx.value.1),
+                    )
                 };
 
                 match name {
@@ -103,23 +91,21 @@ pub(crate) trait MessageType: Sized {
                         return Err(ParseError::Header);
                     }
 
-                    header::CONTENT_LENGTH => match value.to_str().map(str::trim) {
+                    header::CONTENT_LENGTH => match value.to_str() {
-                        Ok(val) if val.starts_with('+') => {
+                        Ok(s) if s.trim().starts_with('+') => {
-                            debug!("illegal Content-Length: {:?}", val);
+                            debug!("illegal Content-Length: {:?}", s);
                             return Err(ParseError::Header);
                         }
-
+                        Ok(s) => {
-                        Ok(val) => {
+                            if let Ok(len) = s.parse::<u64>() {
-                            if let Ok(len) = val.parse::<u64>() {
+                                if len != 0 {
-                                // accept 0 lengths here and remove them in `decode` after all
-                                // headers have been processed to prevent request smuggling issues
                                     content_length = Some(len);
+                                }
                             } else {
-                                debug!("illegal Content-Length: {:?}", val);
+                                debug!("illegal Content-Length: {:?}", s);
                                 return Err(ParseError::Header);
                             }
                         }
-
                         Err(_) => {
                             debug!("illegal Content-Length: {:?}", value);
                             return Err(ParseError::Header);
@@ -132,23 +118,22 @@ pub(crate) trait MessageType: Sized {
                         return Err(ParseError::Header);
                     }
 
-                    header::TRANSFER_ENCODING if version == Version::HTTP_11 => {
+                    header::TRANSFER_ENCODING => {
                         seen_te = true;
 
-                        if let Ok(val) = value.to_str().map(str::trim) {
+                        if let Ok(s) = value.to_str().map(str::trim) {
-                            if val.eq_ignore_ascii_case("chunked") {
+                            if s.eq_ignore_ascii_case("chunked") {
                                 chunked = true;
-                            } else if val.eq_ignore_ascii_case("identity") {
+                            } else if s.eq_ignore_ascii_case("identity") {
                                 // allow silently since multiple TE headers are already checked
                             } else {
-                                debug!("illegal Transfer-Encoding: {:?}", val);
+                                debug!("illegal Transfer-Encoding: {:?}", s);
                                 return Err(ParseError::Header);
                             }
                         } else {
                             return Err(ParseError::Header);
                         }
                     }
-
                     // connection keep-alive state
                     header::CONNECTION => {
                         ka = if let Ok(conn) = value.to_str().map(str::trim) {
@@ -165,7 +150,6 @@ pub(crate) trait MessageType: Sized {
                             None
                         };
                     }
-
                     header::UPGRADE => {
                         if let Ok(val) = value.to_str().map(str::trim) {
                             if val.eq_ignore_ascii_case("websocket") {
@@ -173,28 +157,24 @@ pub(crate) trait MessageType: Sized {
                             }
                         }
                     }
-
                     header::EXPECT => {
                         let bytes = value.as_bytes();
                         if bytes.len() >= 4 && &bytes[0..4] == b"100-" {
                             expect = true;
                         }
                     }
-
                     _ => {}
                 }
 
                 headers.append(name, value);
             }
         }
-
         self.set_connection_type(ka);
-
         if expect {
             self.set_expect()
         }
 
-        // https://datatracker.ietf.org/doc/html/rfc7230#section-3.3.3
+        // https://tools.ietf.org/html/rfc7230#section-3.3.3
         if chunked {
             // Chunked encoding
             Ok(PayloadLength::Payload(PayloadType::Payload(
@@ -214,8 +194,8 @@ pub(crate) trait MessageType: Sized {
 }
 
 impl MessageType for Request {
-    fn set_connection_type(&mut self, conn_type: Option<ConnectionType>) {
+    fn set_connection_type(&mut self, ctype: Option<ConnectionType>) {
-        if let Some(ctype) = conn_type {
+        if let Some(ctype) = ctype {
             self.head_mut().set_connection_type(ctype);
         }
     }
@@ -233,16 +213,15 @@ impl MessageType for Request {
 
         let (len, method, uri, ver, h_len) = {
             // SAFETY:
-            // Create an uninitialized array of `MaybeUninit`. The `assume_init` is safe because the
+            // Create an uninitialized array of `MaybeUninit`. The `assume_init` is
-            // type we are claiming to have initialized here is a bunch of `MaybeUninit`s, which
+            // safe because the type we are claiming to have initialized here is a
-            // do not require initialization.
+            // bunch of `MaybeUninit`s, which do not require initialization.
             let mut parsed = unsafe {
                 MaybeUninit::<[MaybeUninit<httparse::Header<'_>>; MAX_HEADERS]>::uninit()
                     .assume_init()
             };
 
             let mut req = httparse::Request::new(&mut []);
-
             match req.parse_with_uninit_headers(src, &mut parsed)? {
                 httparse::Status::Complete(len) => {
                     let method = Method::from_bytes(req.method.unwrap().as_bytes())
@@ -257,7 +236,6 @@ impl MessageType for Request {
 
                     (len, method, uri, version, req.headers.len())
                 }
-
                 httparse::Status::Partial => {
                     return if src.len() >= MAX_BUFFER_SIZE {
                         trace!("MAX_BUFFER_SIZE unprocessed data reached, closing");
@@ -273,21 +251,7 @@ impl MessageType for Request {
         let mut msg = Request::new();
 
         // convert headers
-        let mut length = msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len], ver)?;
+        let length = msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len])?;
-
-        // disallow HTTP/1.0 POST requests that do not contain a Content-Length headers
-        // see https://datatracker.ietf.org/doc/html/rfc1945#section-7.2.2
-        if ver == Version::HTTP_10 && method == Method::POST && length.is_none() {
-            debug!("no Content-Length specified for HTTP/1.0 POST request");
-            return Err(ParseError::Header);
-        }
-
-        // Remove CL value if 0 now that all headers and HTTP/1.0 special cases are processed.
-        // Protects against some request smuggling attacks.
-        // See https://github.com/actix/actix-web/issues/2767.
-        if length.is_zero() {
-            length = PayloadLength::None;
-        }
 
         // payload decoder
         let decoder = match length {
@@ -315,8 +279,8 @@ impl MessageType for Request {
 }
 
 impl MessageType for ResponseHead {
-    fn set_connection_type(&mut self, conn_type: Option<ConnectionType>) {
+    fn set_connection_type(&mut self, ctype: Option<ConnectionType>) {
-        if let Some(ctype) = conn_type {
+        if let Some(ctype) = ctype {
             ResponseHead::set_connection_type(self, ctype);
         }
     }
@@ -331,35 +295,22 @@ impl MessageType for ResponseHead {
         let mut headers: [HeaderIndex; MAX_HEADERS] = EMPTY_HEADER_INDEX_ARRAY;
 
         let (len, ver, status, h_len) = {
-            // SAFETY:
+            let mut parsed: [httparse::Header<'_>; MAX_HEADERS] = EMPTY_HEADER_ARRAY;
-            // Create an uninitialized array of `MaybeUninit`. The `assume_init` is safe because the
-            // type we are claiming to have initialized here is a bunch of `MaybeUninit`s, which
-            // do not require initialization.
-            let mut parsed = unsafe {
-                MaybeUninit::<[MaybeUninit<httparse::Header<'_>>; MAX_HEADERS]>::uninit()
-                    .assume_init()
-            };
 
-            let mut res = httparse::Response::new(&mut []);
+            let mut res = httparse::Response::new(&mut parsed);
-
+            match res.parse(src)? {
-            let mut config = httparse::ParserConfig::default();
-            config.allow_spaces_after_header_name_in_responses(true);
-
-            match config.parse_response_with_uninit_headers(&mut res, src, &mut parsed)? {
                 httparse::Status::Complete(len) => {
                     let version = if res.version.unwrap() == 1 {
                         Version::HTTP_11
                     } else {
                         Version::HTTP_10
                     };
-
+                    let status = StatusCode::from_u16(res.code.unwrap())
-                    let status =
+                        .map_err(|_| ParseError::Status)?;
-                        StatusCode::from_u16(res.code.unwrap()).map_err(|_| ParseError::Status)?;
                     HeaderIndex::record(src, res.headers, &mut headers);
 
                     (len, version, status, res.headers.len())
                 }
-
                 httparse::Status::Partial => {
                     return if src.len() >= MAX_BUFFER_SIZE {
                         error!("MAX_BUFFER_SIZE unprocessed data reached, closing");
@@ -375,14 +326,7 @@ impl MessageType for ResponseHead {
         msg.version = ver;
 
         // convert headers
-        let mut length = msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len], ver)?;
+        let length = msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len])?;
-
-        // Remove CL value if 0 now that all headers and HTTP/1.0 special cases are processed.
-        // Protects against some request smuggling attacks.
-        // See https://github.com/actix/actix-web/issues/2767.
-        if length.is_zero() {
-            length = PayloadLength::None;
-        }
 
         // message payload
         let decoder = if let PayloadLength::Payload(pl) = length {
@@ -418,6 +362,9 @@ pub(crate) const EMPTY_HEADER_INDEX: HeaderIndex = HeaderIndex {
 pub(crate) const EMPTY_HEADER_INDEX_ARRAY: [HeaderIndex; MAX_HEADERS] =
     [EMPTY_HEADER_INDEX; MAX_HEADERS];
 
+pub(crate) const EMPTY_HEADER_ARRAY: [httparse::Header<'static>; MAX_HEADERS] =
+    [httparse::EMPTY_HEADER; MAX_HEADERS];
+
 impl HeaderIndex {
     pub(crate) fn record(
         bytes: &[u8],
@@ -436,64 +383,61 @@ impl HeaderIndex {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
-/// Chunk type yielded while decoding a payload.
+/// Http payload item
 pub enum PayloadItem {
     Chunk(Bytes),
     Eof,
 }
 
-/// Decoder that can handle different payload types.
+/// Decoders to handle different Transfer-Encodings.
 ///
-/// If a message body does not use `Transfer-Encoding`, it should include a `Content-Length`.
+/// If a message body does not include a Transfer-Encoding, it *should*
-#[derive(Debug, Clone, PartialEq, Eq)]
+/// include a Content-Length header.
+#[derive(Debug, Clone, PartialEq)]
 pub struct PayloadDecoder {
     kind: Kind,
 }
 
 impl PayloadDecoder {
-    /// Constructs a fixed-length payload decoder.
     pub fn length(x: u64) -> PayloadDecoder {
         PayloadDecoder {
             kind: Kind::Length(x),
         }
     }
 
-    /// Constructs a chunked encoding decoder.
     pub fn chunked() -> PayloadDecoder {
         PayloadDecoder {
             kind: Kind::Chunked(ChunkedState::Size, 0),
         }
     }
 
-    /// Creates an decoder that yields chunks until the stream returns EOF.
     pub fn eof() -> PayloadDecoder {
         PayloadDecoder { kind: Kind::Eof }
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq)]
 enum Kind {
-    /// A reader used when a `Content-Length` header is passed with a positive integer.
+    /// A Reader used when a Content-Length header is passed with a positive
+    /// integer.
     Length(u64),
-
+    /// A Reader used when Transfer-Encoding is `chunked`.
-    /// A reader used when `Transfer-Encoding` is `chunked`.
     Chunked(ChunkedState, u64),
-
+    /// A Reader used for responses that don't indicate a length or chunked.
-    /// A reader used for responses that don't indicate a length or chunked.
     ///
-    /// Note: This should only used for `Response`s. It is illegal for a `Request` to be made
+    /// Note: This should only used for `Response`s. It is illegal for a
-    /// without either of `Content-Length` and `Transfer-Encoding: chunked` missing, as explained
+    /// `Request` to be made with both `Content-Length` and
-    /// in [RFC 7230 §3.3.3]:
+    /// `Transfer-Encoding: chunked` missing, as explained from the spec:
     ///
-    /// > If a Transfer-Encoding header field is present in a response and the chunked transfer
+    /// > If a Transfer-Encoding header field is present in a response and
-    /// > coding is not the final encoding, the message body length is determined by reading the
+    /// > the chunked transfer coding is not the final encoding, the
-    /// > connection until it is closed by the server. If a Transfer-Encoding header field is
+    /// > message body length is determined by reading the connection until
-    /// > present in a request and the chunked transfer coding is not the final encoding, the
+    /// > it is closed by the server.  If a Transfer-Encoding header field
-    /// > message body length cannot be determined reliably; the server MUST respond with the 400
+    /// > is present in a request and the chunked transfer coding is not
-    /// > (Bad Request) status code and then close the connection.
+    /// > the final encoding, the message body length cannot be determined
-    ///
+    /// > reliably; the server MUST respond with the 400 (Bad Request)
-    /// [RFC 7230 §3.3.3]: https://datatracker.ietf.org/doc/html/rfc7230#section-3.3.3
+    /// > status code and then close the connection.
     Eof,
 }
 
@@ -523,7 +467,6 @@ impl Decoder for PayloadDecoder {
                     Ok(Some(PayloadItem::Chunk(buf)))
                 }
             }
-
             Kind::Chunked(ref mut state, ref mut size) => {
                 loop {
                     let mut buf = None;
@@ -532,7 +475,7 @@ impl Decoder for PayloadDecoder {
                     *state = match state.step(src, size, &mut buf) {
                         Poll::Pending => return Ok(None),
                         Poll::Ready(Ok(state)) => state,
-                        Poll::Ready(Err(err)) => return Err(err),
+                        Poll::Ready(Err(e)) => return Err(e),
                     };
 
                     if *state == ChunkedState::End {
@@ -549,7 +492,6 @@ impl Decoder for PayloadDecoder {
                     }
                 }
             }
-
             Kind::Eof => {
                 if src.is_empty() {
                     Ok(None)
@@ -563,8 +505,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,
+        http::header::{HeaderName, SET_COOKIE},
+        HttpMessage as _,
+    };
 
     impl PayloadType {
         pub(crate) fn unwrap(self) -> PayloadDecoder {
@@ -644,105 +593,20 @@ mod tests {
     }
 
     #[test]
-    fn parse_h09_reject() {
+    fn test_parse_post() {
-        let mut buf = BytesMut::from(
+        let mut buf = BytesMut::from("POST /test2 HTTP/1.0\r\n\r\n");
-            "GET /test1 HTTP/0.9\r\n\
-            \r\n",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        reader.decode(&mut buf).unwrap_err();
-
-        let mut buf = BytesMut::from(
-            "POST /test2 HTTP/0.9\r\n\
-            Content-Length: 3\r\n\
-            \r\n
-            abc",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        reader.decode(&mut buf).unwrap_err();
-    }
-
-    #[test]
-    fn parse_h10_get() {
-        let mut buf = BytesMut::from(
-            "GET /test1 HTTP/1.0\r\n\
-            \r\n",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        let (req, _) = reader.decode(&mut buf).unwrap().unwrap();
-        assert_eq!(req.version(), Version::HTTP_10);
-        assert_eq!(*req.method(), Method::GET);
-        assert_eq!(req.path(), "/test1");
-
-        let mut buf = BytesMut::from(
-            "GET /test2 HTTP/1.0\r\n\
-            Content-Length: 0\r\n\
-            \r\n",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        let (req, _) = reader.decode(&mut buf).unwrap().unwrap();
-        assert_eq!(req.version(), Version::HTTP_10);
-        assert_eq!(*req.method(), Method::GET);
-        assert_eq!(req.path(), "/test2");
-
-        let mut buf = BytesMut::from(
-            "GET /test3 HTTP/1.0\r\n\
-            Content-Length: 3\r\n\
-            \r\n
-            abc",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        let (req, _) = reader.decode(&mut buf).unwrap().unwrap();
-        assert_eq!(req.version(), Version::HTTP_10);
-        assert_eq!(*req.method(), Method::GET);
-        assert_eq!(req.path(), "/test3");
-    }
-
-    #[test]
-    fn parse_h10_post() {
-        let mut buf = BytesMut::from(
-            "POST /test1 HTTP/1.0\r\n\
-            Content-Length: 3\r\n\
-            \r\n\
-            abc",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        let (req, _) = reader.decode(&mut buf).unwrap().unwrap();
-        assert_eq!(req.version(), Version::HTTP_10);
-        assert_eq!(*req.method(), Method::POST);
-        assert_eq!(req.path(), "/test1");
-
-        let mut buf = BytesMut::from(
-            "POST /test2 HTTP/1.0\r\n\
-            Content-Length: 0\r\n\
-            \r\n",
-        );
 
         let mut reader = MessageDecoder::<Request>::default();
         let (req, _) = reader.decode(&mut buf).unwrap().unwrap();
         assert_eq!(req.version(), Version::HTTP_10);
         assert_eq!(*req.method(), Method::POST);
         assert_eq!(req.path(), "/test2");
-
-        let mut buf = BytesMut::from(
-            "POST /test3 HTTP/1.0\r\n\
-            \r\n",
-        );
-
-        let mut reader = MessageDecoder::<Request>::default();
-        let err = reader.decode(&mut buf).unwrap_err();
-        assert!(err.to_string().contains("Header"))
     }
 
     #[test]
     fn test_parse_body() {
-        let mut buf = BytesMut::from("GET /test HTTP/1.1\r\nContent-Length: 4\r\n\r\nbody");
+        let mut buf =
+            BytesMut::from("GET /test HTTP/1.1\r\nContent-Length: 4\r\n\r\nbody");
 
         let mut reader = MessageDecoder::<Request>::default();
         let (req, pl) = reader.decode(&mut buf).unwrap().unwrap();
@@ -758,7 +622,8 @@ mod tests {
 
     #[test]
     fn test_parse_body_crlf() {
-        let mut buf = BytesMut::from("\r\nGET /test HTTP/1.1\r\nContent-Length: 4\r\n\r\nbody");
+        let mut buf =
+            BytesMut::from("\r\nGET /test HTTP/1.1\r\nContent-Length: 4\r\n\r\nbody");
 
         let mut reader = MessageDecoder::<Request>::default();
         let (req, pl) = reader.decode(&mut buf).unwrap().unwrap();
@@ -833,98 +698,121 @@ mod tests {
 
     #[test]
     fn test_conn_default_1_0() {
-        let req = parse_ready!(&mut BytesMut::from("GET /test HTTP/1.0\r\n\r\n"));
+        let mut buf = BytesMut::from("GET /test HTTP/1.0\r\n\r\n");
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::Close);
     }
 
     #[test]
     fn test_conn_default_1_1() {
-        let req = parse_ready!(&mut BytesMut::from("GET /test HTTP/1.1\r\n\r\n"));
+        let mut buf = BytesMut::from("GET /test HTTP/1.1\r\n\r\n");
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::KeepAlive);
     }
 
     #[test]
     fn test_conn_close() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              connection: close\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::Close);
 
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              connection: Close\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::Close);
     }
 
     #[test]
     fn test_conn_close_1_0() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.0\r\n\
              connection: close\r\n\r\n",
-        ));
+        );
+
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::Close);
     }
 
     #[test]
     fn test_conn_keep_alive_1_0() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.0\r\n\
              connection: keep-alive\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::KeepAlive);
 
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.0\r\n\
              connection: Keep-Alive\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::KeepAlive);
     }
 
     #[test]
     fn test_conn_keep_alive_1_1() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              connection: keep-alive\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::KeepAlive);
     }
 
     #[test]
     fn test_conn_other_1_0() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.0\r\n\
              connection: other\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::Close);
     }
 
     #[test]
     fn test_conn_other_1_1() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              connection: other\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.head().connection_type(), ConnectionType::KeepAlive);
     }
 
     #[test]
     fn test_conn_upgrade() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              upgrade: websockets\r\n\
              connection: upgrade\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
 
         assert!(req.upgrade());
         assert_eq!(req.head().connection_type(), ConnectionType::Upgrade);
 
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              upgrade: Websockets\r\n\
              connection: Upgrade\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
 
         assert!(req.upgrade());
         assert_eq!(req.head().connection_type(), ConnectionType::Upgrade);
@@ -932,62 +820,59 @@ mod tests {
 
     #[test]
     fn test_conn_upgrade_connect_method() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "CONNECT /test HTTP/1.1\r\n\
              content-type: text/plain\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
 
         assert!(req.upgrade());
     }
 
     #[test]
-    fn test_headers_bad_content_length() {
+    fn test_headers_content_length_err_1() {
-        // string CL
+        let mut buf = BytesMut::from(
-        expect_parse_err!(&mut BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              content-length: line\r\n\r\n",
-        ));
+        );
 
-        // negative CL
+        expect_parse_err!(&mut buf)
-        expect_parse_err!(&mut BytesMut::from(
-            "GET /test HTTP/1.1\r\n\
-             content-length: -1\r\n\r\n",
-        ));
     }
 
     #[test]
-    fn octal_ish_cl_parsed_as_decimal() {
+    fn test_headers_content_length_err_2() {
         let mut buf = BytesMut::from(
-            "POST /test HTTP/1.1\r\n\
+            "GET /test HTTP/1.1\r\n\
-             content-length: 011\r\n\r\n",
+             content-length: -1\r\n\r\n",
         );
-        let mut reader = MessageDecoder::<Request>::default();
+
-        let (_req, pl) = reader.decode(&mut buf).unwrap().unwrap();
+        expect_parse_err!(&mut buf);
-        assert!(matches!(
-            pl,
-            PayloadType::Payload(pl) if pl == PayloadDecoder::length(11)
-        ));
     }
 
     #[test]
     fn test_invalid_header() {
-        expect_parse_err!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              test line\r\n\r\n",
-        ));
+        );
+
+        expect_parse_err!(&mut buf);
     }
 
     #[test]
     fn test_invalid_name() {
-        expect_parse_err!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              test[]: line\r\n\r\n",
-        ));
+        );
+
+        expect_parse_err!(&mut buf);
     }
 
     #[test]
     fn test_http_request_bad_status_line() {
-        expect_parse_err!(&mut BytesMut::from("getpath \r\n\r\n"));
+        let mut buf = BytesMut::from("getpath \r\n\r\n");
+        expect_parse_err!(&mut buf);
     }
 
     #[test]
@@ -1027,10 +912,11 @@ mod tests {
 
     #[test]
     fn test_http_request_parser_utf8() {
-        let req = parse_ready!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET /test HTTP/1.1\r\n\
              x-test: тест\r\n\r\n",
-        ));
+        );
+        let req = parse_ready!(&mut buf);
 
         assert_eq!(
             req.headers().get("x-test").unwrap().as_bytes(),
@@ -1040,18 +926,24 @@ mod tests {
 
     #[test]
     fn test_http_request_parser_two_slashes() {
-        let req = parse_ready!(&mut BytesMut::from("GET //path HTTP/1.1\r\n\r\n"));
+        let mut buf = BytesMut::from("GET //path HTTP/1.1\r\n\r\n");
+        let req = parse_ready!(&mut buf);
+
         assert_eq!(req.path(), "//path");
     }
 
     #[test]
     fn test_http_request_parser_bad_method() {
-        expect_parse_err!(&mut BytesMut::from("!12%()+=~$ /get HTTP/1.1\r\n\r\n"));
+        let mut buf = BytesMut::from("!12%()+=~$ /get HTTP/1.1\r\n\r\n");
+
+        expect_parse_err!(&mut buf);
     }
 
     #[test]
     fn test_http_request_parser_bad_version() {
-        expect_parse_err!(&mut BytesMut::from("GET //get HT/11\r\n\r\n"));
+        let mut buf = BytesMut::from("GET //get HT/11\r\n\r\n");
+
+        expect_parse_err!(&mut buf);
     }
 
     #[test]
@@ -1068,66 +960,29 @@ mod tests {
 
     #[test]
     fn hrs_multiple_content_length() {
-        expect_parse_err!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET / HTTP/1.1\r\n\
             Host: example.com\r\n\
             Content-Length: 4\r\n\
             Content-Length: 2\r\n\
             \r\n\
             abcd",
-        ));
+        );
 
-        expect_parse_err!(&mut BytesMut::from(
+        expect_parse_err!(&mut buf);
-            "GET / HTTP/1.1\r\n\
-            Host: example.com\r\n\
-            Content-Length: 0\r\n\
-            Content-Length: 2\r\n\
-            \r\n\
-            ab",
-        ));
     }
 
     #[test]
     fn hrs_content_length_plus() {
-        expect_parse_err!(&mut BytesMut::from(
+        let mut buf = BytesMut::from(
             "GET / HTTP/1.1\r\n\
             Host: example.com\r\n\
             Content-Length: +3\r\n\
             \r\n\
             000",
-        ));
-    }
-
-    #[test]
-    fn hrs_te_http10() {
-        // in HTTP/1.0 transfer encoding is ignored and must therefore contain a CL header
-
-        expect_parse_err!(&mut BytesMut::from(
-            "POST / HTTP/1.0\r\n\
-            Host: example.com\r\n\
-            Transfer-Encoding: chunked\r\n\
-            \r\n\
-            3\r\n\
-            aaa\r\n\
-            0\r\n\
-            ",
-        ));
-    }
-
-    #[test]
-    fn hrs_cl_and_te_http10() {
-        // in HTTP/1.0 transfer encoding is simply ignored so it's fine to have both
-
-        let mut buf = BytesMut::from(
-            "GET / HTTP/1.0\r\n\
-            Host: example.com\r\n\
-            Content-Length: 3\r\n\
-            Transfer-Encoding: chunked\r\n\
-            \r\n\
-            000",
         );
 
-        parse_ready!(&mut buf);
+        expect_parse_err!(&mut buf);
     }
 
     #[test]

actix-http/src/h1/dispatcher_tests.rs

@@ -1,972 +0,0 @@
-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_utils::future::{ready, Ready};
-use bytes::{Buf, Bytes, BytesMut};
-use futures_util::future::lazy;
-
-use super::dispatcher::{Dispatcher, DispatcherState, DispatcherStateProj, Flags};
-use crate::{
-    body::MessageBody,
-    config::ServiceConfig,
-    h1::{Codec, ExpectHandler, UpgradeHandler},
-    service::HttpFlow,
-    test::{TestBuffer, TestSeqBuffer},
-    Error, HttpMessage, KeepAlive, Method, OnConnectData, Request, Response, StatusCode,
-};
-
-fn find_slice(haystack: &[u8], needle: &[u8], from: usize) -> Option<usize> {
-    memchr::memmem::find(&haystack[from..], needle)
-}
-
-fn stabilize_date_header(payload: &mut [u8]) {
-    let mut from = 0;
-    while let Some(pos) = find_slice(payload, b"date", from) {
-        payload[(from + pos)..(from + pos + 35)]
-            .copy_from_slice(b"date: Thu, 01 Jan 1970 12:34:56 UTC");
-        from += 35;
-    }
-}
-
-fn ok_service() -> impl Service<Request, Response = Response<impl MessageBody>, Error = Error> {
-    status_service(StatusCode::OK)
-}
-
-fn status_service(
-    status: StatusCode,
-) -> impl Service<Request, Response = Response<impl MessageBody>, Error = Error> {
-    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_service(|req: Request| {
-        let path = req.path().as_bytes();
-        ready(Ok::<_, Error>(
-            Response::ok().set_body(Bytes::copy_from_slice(path)),
-        ))
-    })
-}
-
-fn drop_payload_service() -> impl Service<Request, Response = Response<&'static str>, Error = Error>
-{
-    fn_service(|mut req: Request| async move {
-        let _ = req.take_payload();
-        Ok::<_, Error>(Response::with_body(StatusCode::OK, "payload dropped"))
-    })
-}
-
-fn echo_payload_service() -> impl Service<Request, Response = Response<Bytes>, Error = Error> {
-    fn_service(|mut req: Request| {
-        Box::pin(async move {
-            use futures_util::StreamExt as _;
-
-            let mut pl = req.take_payload();
-            let mut body = BytesMut::new();
-            while let Some(chunk) = pl.next().await {
-                body.extend_from_slice(chunk.unwrap().chunk())
-            }
-
-            Ok::<_, Error>(Response::ok().set_body(body.freeze()))
-        })
-    })
-}
-
-#[actix_rt::test]
-async fn late_request() {
-    let mut buf = TestBuffer::empty();
-
-    let cfg = ServiceConfig::new(
-        KeepAlive::Disabled,
-        Duration::from_millis(100),
-        Duration::ZERO,
-        false,
-        None,
-    );
-    let services = HttpFlow::new(ok_service(), ExpectHandler, None);
-
-    let h1 = Dispatcher::<_, _, _, _, UpgradeHandler>::new(
-        buf.clone(),
-        services,
-        cfg,
-        None,
-        OnConnectData::default(),
-    );
-    pin!(h1);
-
-    lazy(|cx| {
-        assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
-
-        match h1.as_mut().poll(cx) {
-            Poll::Ready(_) => panic!("first poll should not be ready"),
-            Poll::Pending => {}
-        }
-
-        // polls: initial
-        assert_eq!(h1.poll_count, 1);
-
-        buf.extend_read_buf("GET /abcd HTTP/1.1\r\nConnection: close\r\n\r\n");
-
-        match h1.as_mut().poll(cx) {
-            Poll::Pending => panic!("second poll should not be pending"),
-            Poll::Ready(res) => assert!(res.is_ok()),
-        }
-
-        // polls: initial pending => handle req => shutdown
-        assert_eq!(h1.poll_count, 3);
-
-        let mut res = buf.take_write_buf().to_vec();
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        let exp = b"\
-                HTTP/1.1 200 OK\r\n\
-                content-length: 0\r\n\
-                connection: close\r\n\
-                date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\r\n\
-                ";
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(exp)
-        );
-    })
-    .await;
-}
-
-#[actix_rt::test]
-async fn oneshot_connection() {
-    let buf = TestBuffer::new("GET /abcd HTTP/1.1\r\n\r\n");
-
-    let cfg = ServiceConfig::new(
-        KeepAlive::Disabled,
-        Duration::from_millis(100),
-        Duration::ZERO,
-        false,
-        None,
-    );
-    let services = HttpFlow::new(echo_path_service(), ExpectHandler, None);
-
-    let h1 = Dispatcher::<_, _, _, _, UpgradeHandler>::new(
-        buf.clone(),
-        services,
-        cfg,
-        None,
-        OnConnectData::default(),
-    );
-    pin!(h1);
-
-    lazy(|cx| {
-        assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
-
-        match h1.as_mut().poll(cx) {
-            Poll::Pending => panic!("first poll should not be pending"),
-            Poll::Ready(res) => assert!(res.is_ok()),
-        }
-
-        // polls: initial => shutdown
-        assert_eq!(h1.poll_count, 2);
-
-        let mut res = buf.take_write_buf().to_vec();
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        let exp = http_msg(
-            r"
-            HTTP/1.1 200 OK
-            content-length: 5
-            connection: close
-            date: Thu, 01 Jan 1970 12:34:56 UTC
-
-            /abcd
-            ",
-        );
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(&exp)
-        );
-    })
-    .await;
-}
-
-#[actix_rt::test]
-async fn keep_alive_timeout() {
-    let buf = TestBuffer::new("GET /abcd HTTP/1.1\r\n\r\n");
-
-    let cfg = ServiceConfig::new(
-        KeepAlive::Timeout(Duration::from_millis(200)),
-        Duration::from_millis(100),
-        Duration::ZERO,
-        false,
-        None,
-    );
-    let services = HttpFlow::new(echo_path_service(), ExpectHandler, None);
-
-    let h1 = Dispatcher::<_, _, _, _, UpgradeHandler>::new(
-        buf.clone(),
-        services,
-        cfg,
-        None,
-        OnConnectData::default(),
-    );
-    pin!(h1);
-
-    lazy(|cx| {
-        assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
-
-        assert!(
-            h1.as_mut().poll(cx).is_pending(),
-            "keep-alive should prevent poll from resolving"
-        );
-
-        // polls: initial
-        assert_eq!(h1.poll_count, 1);
-
-        let mut res = buf.take_write_buf().to_vec();
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        let exp = b"\
-                HTTP/1.1 200 OK\r\n\
-                content-length: 5\r\n\
-                date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\r\n\
-                /abcd\
-                ";
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(exp)
-        );
-    })
-    .await;
-
-    // sleep slightly longer than keep-alive timeout
-    sleep(Duration::from_millis(250)).await;
-
-    lazy(|cx| {
-        assert!(
-            h1.as_mut().poll(cx).is_ready(),
-            "keep-alive should have resolved",
-        );
-
-        // polls: initial => keep-alive wake-up shutdown
-        assert_eq!(h1.poll_count, 2);
-
-        if let DispatcherStateProj::Normal { inner } = h1.project().inner.project() {
-            // connection closed
-            assert!(inner.flags.contains(Flags::SHUTDOWN));
-            assert!(inner.flags.contains(Flags::WRITE_DISCONNECT));
-            // and nothing added to write buffer
-            assert!(buf.write_buf_slice().is_empty());
-        }
-    })
-    .await;
-}
-
-#[actix_rt::test]
-async fn keep_alive_follow_up_req() {
-    let mut buf = TestBuffer::new("GET /abcd HTTP/1.1\r\n\r\n");
-
-    let cfg = ServiceConfig::new(
-        KeepAlive::Timeout(Duration::from_millis(500)),
-        Duration::from_millis(100),
-        Duration::ZERO,
-        false,
-        None,
-    );
-    let services = HttpFlow::new(echo_path_service(), ExpectHandler, None);
-
-    let h1 = Dispatcher::<_, _, _, _, UpgradeHandler>::new(
-        buf.clone(),
-        services,
-        cfg,
-        None,
-        OnConnectData::default(),
-    );
-    pin!(h1);
-
-    lazy(|cx| {
-        assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
-
-        assert!(
-            h1.as_mut().poll(cx).is_pending(),
-            "keep-alive should prevent poll from resolving"
-        );
-
-        // polls: initial
-        assert_eq!(h1.poll_count, 1);
-
-        let mut res = buf.take_write_buf().to_vec();
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        let exp = b"\
-                HTTP/1.1 200 OK\r\n\
-                content-length: 5\r\n\
-                date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\r\n\
-                /abcd\
-                ";
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(exp)
-        );
-    })
-    .await;
-
-    // sleep for less than KA timeout
-    sleep(Duration::from_millis(100)).await;
-
-    lazy(|cx| {
-        assert!(
-            h1.as_mut().poll(cx).is_pending(),
-            "keep-alive should not have resolved dispatcher yet",
-        );
-
-        // polls: initial => manual
-        assert_eq!(h1.poll_count, 2);
-
-        if let DispatcherStateProj::Normal { inner } = h1.as_mut().project().inner.project() {
-            // connection not closed
-            assert!(!inner.flags.contains(Flags::SHUTDOWN));
-            assert!(!inner.flags.contains(Flags::WRITE_DISCONNECT));
-            // and nothing added to write buffer
-            assert!(buf.write_buf_slice().is_empty());
-        }
-    })
-    .await;
-
-    lazy(|cx| {
-        buf.extend_read_buf(
-            "\
-            GET /efg HTTP/1.1\r\n\
-            Connection: close\r\n\
-            \r\n\r\n",
-        );
-
-        assert!(
-            h1.as_mut().poll(cx).is_ready(),
-            "connection close header should override keep-alive setting",
-        );
-
-        // polls: initial => manual => follow-up req => shutdown
-        assert_eq!(h1.poll_count, 4);
-
-        if let DispatcherStateProj::Normal { inner } = h1.as_mut().project().inner.project() {
-            // connection closed
-            assert!(inner.flags.contains(Flags::SHUTDOWN));
-            assert!(!inner.flags.contains(Flags::WRITE_DISCONNECT));
-        }
-
-        let mut res = buf.take_write_buf().to_vec();
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        let exp = b"\
-                HTTP/1.1 200 OK\r\n\
-                content-length: 4\r\n\
-                connection: close\r\n\
-                date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\r\n\
-                /efg\
-                ";
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(exp)
-        );
-    })
-    .await;
-}
-
-#[actix_rt::test]
-async fn req_parse_err() {
-    lazy(|cx| {
-        let buf = TestBuffer::new("GET /test HTTP/1\r\n\r\n");
-
-        let services = HttpFlow::new(ok_service(), ExpectHandler, None);
-
-        let h1 = Dispatcher::<_, _, _, _, UpgradeHandler>::new(
-            buf.clone(),
-            services,
-            ServiceConfig::default(),
-            None,
-            OnConnectData::default(),
-        );
-
-        pin!(h1);
-
-        match h1.as_mut().poll(cx) {
-            Poll::Pending => panic!(),
-            Poll::Ready(res) => assert!(res.is_err()),
-        }
-
-        if let DispatcherStateProj::Normal { inner } = h1.project().inner.project() {
-            assert!(inner.flags.contains(Flags::READ_DISCONNECT));
-            assert_eq!(
-                &buf.write_buf_slice()[..26],
-                b"HTTP/1.1 400 Bad Request\r\n"
-            );
-        }
-    })
-    .await;
-}
-
-#[actix_rt::test]
-async fn pipelining_ok_then_ok() {
-    lazy(|cx| {
-        let buf = TestBuffer::new(
-            "\
-                GET /abcd HTTP/1.1\r\n\r\n\
-                GET /def HTTP/1.1\r\n\r\n\
-                ",
-        );
-
-        let cfg = ServiceConfig::new(
-            KeepAlive::Disabled,
-            Duration::from_millis(1),
-            Duration::from_millis(1),
-            false,
-            None,
-        );
-
-        let services = HttpFlow::new(echo_path_service(), ExpectHandler, None);
-
-        let h1 = Dispatcher::<_, _, _, _, UpgradeHandler>::new(
-            buf.clone(),
-            services,
-            cfg,
-            None,
-            OnConnectData::default(),
-        );
-
-        pin!(h1);
-
-        assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
-
-        match h1.as_mut().poll(cx) {
-            Poll::Pending => panic!("first poll should not be pending"),
-            Poll::Ready(res) => assert!(res.is_ok()),
-        }
-
-        // polls: initial => shutdown
-        assert_eq!(h1.poll_count, 2);
-
-        let mut res = buf.write_buf_slice_mut();
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        let exp = b"\
-                HTTP/1.1 200 OK\r\n\
-                content-length: 5\r\n\
-                connection: close\r\n\
-                date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\r\n\
-                /abcd\
-                HTTP/1.1 200 OK\r\n\
-                content-length: 4\r\n\
-                connection: close\r\n\
-                date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\r\n\
-                /def\
-                ";
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(exp)
-        );
-    })
-    .await;
-}
-
-#[actix_rt::test]
-async fn pipelining_ok_then_bad() {
-    lazy(|cx| {
-        let buf = TestBuffer::new(
-            "\
-                GET /abcd HTTP/1.1\r\n\r\n\
-                GET /def HTTP/1\r\n\r\n\
-                ",
-        );
-
-        let cfg = ServiceConfig::new(
-            KeepAlive::Disabled,
-            Duration::from_millis(1),
-            Duration::from_millis(1),
-            false,
-            None,
-        );
-
-        let services = HttpFlow::new(echo_path_service(), ExpectHandler, None);
-
-        let h1 = Dispatcher::<_, _, _, _, UpgradeHandler>::new(
-            buf.clone(),
-            services,
-            cfg,
-            None,
-            OnConnectData::default(),
-        );
-
-        pin!(h1);
-
-        assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
-
-        match h1.as_mut().poll(cx) {
-            Poll::Pending => panic!("first poll should not be pending"),
-            Poll::Ready(res) => assert!(res.is_err()),
-        }
-
-        // polls: initial => shutdown
-        assert_eq!(h1.poll_count, 1);
-
-        let mut res = buf.write_buf_slice_mut();
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        let exp = b"\
-                HTTP/1.1 200 OK\r\n\
-                content-length: 5\r\n\
-                connection: close\r\n\
-                date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\r\n\
-                /abcd\
-                HTTP/1.1 400 Bad Request\r\n\
-                content-length: 0\r\n\
-                connection: close\r\n\
-                date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\r\n\
-                ";
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(exp)
-        );
-    })
-    .await;
-}
-
-#[actix_rt::test]
-async fn expect_handling() {
-    lazy(|cx| {
-        let mut buf = TestSeqBuffer::empty();
-        let cfg = ServiceConfig::new(
-            KeepAlive::Disabled,
-            Duration::ZERO,
-            Duration::ZERO,
-            false,
-            None,
-        );
-
-        let services = HttpFlow::new(echo_payload_service(), ExpectHandler, None);
-
-        let h1 = Dispatcher::<_, _, _, _, UpgradeHandler>::new(
-            buf.clone(),
-            services,
-            cfg,
-            None,
-            OnConnectData::default(),
-        );
-
-        buf.extend_read_buf(
-            "\
-                POST /upload HTTP/1.1\r\n\
-                Content-Length: 5\r\n\
-                Expect: 100-continue\r\n\
-                \r\n\
-                ",
-        );
-
-        pin!(h1);
-
-        assert!(h1.as_mut().poll(cx).is_pending());
-        assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
-
-        // polls: manual
-        assert_eq!(h1.poll_count, 1);
-
-        if let DispatcherState::Normal { ref inner } = h1.inner {
-            let io = inner.io.as_ref().unwrap();
-            let res = &io.write_buf()[..];
-            assert_eq!(
-                str::from_utf8(res).unwrap(),
-                "HTTP/1.1 100 Continue\r\n\r\n"
-            );
-        }
-
-        buf.extend_read_buf("12345");
-        assert!(h1.as_mut().poll(cx).is_ready());
-
-        // polls: manual manual shutdown
-        assert_eq!(h1.poll_count, 3);
-
-        if let DispatcherState::Normal { ref inner } = h1.inner {
-            let io = inner.io.as_ref().unwrap();
-            let mut res = io.write_buf()[..].to_owned();
-            stabilize_date_header(&mut res);
-
-            assert_eq!(
-                str::from_utf8(&res).unwrap(),
-                "\
-                    HTTP/1.1 100 Continue\r\n\
-                    \r\n\
-                    HTTP/1.1 200 OK\r\n\
-                    content-length: 5\r\n\
-                    connection: close\r\n\
-                    date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\
-                    \r\n\
-                    12345\
-                    "
-            );
-        }
-    })
-    .await;
-}
-
-#[actix_rt::test]
-async fn expect_eager() {
-    lazy(|cx| {
-        let mut buf = TestSeqBuffer::empty();
-        let cfg = ServiceConfig::new(
-            KeepAlive::Disabled,
-            Duration::ZERO,
-            Duration::ZERO,
-            false,
-            None,
-        );
-
-        let services = HttpFlow::new(echo_path_service(), ExpectHandler, None);
-
-        let h1 = Dispatcher::<_, _, _, _, UpgradeHandler>::new(
-            buf.clone(),
-            services,
-            cfg,
-            None,
-            OnConnectData::default(),
-        );
-
-        buf.extend_read_buf(
-            "\
-                POST /upload HTTP/1.1\r\n\
-                Content-Length: 5\r\n\
-                Expect: 100-continue\r\n\
-                \r\n\
-                ",
-        );
-
-        pin!(h1);
-
-        assert!(h1.as_mut().poll(cx).is_ready());
-        assert!(matches!(&h1.inner, DispatcherState::Normal { .. }));
-
-        // polls: manual shutdown
-        assert_eq!(h1.poll_count, 2);
-
-        if let DispatcherState::Normal { ref inner } = h1.inner {
-            let io = inner.io.as_ref().unwrap();
-            let mut res = io.write_buf()[..].to_owned();
-            stabilize_date_header(&mut res);
-
-            // Despite the content-length header and even though the request payload has not
-            // been sent, this test expects a complete service response since the payload
-            // is not used at all. The service passed to dispatcher is path echo and doesn't
-            // consume payload bytes.
-            assert_eq!(
-                str::from_utf8(&res).unwrap(),
-                "\
-                    HTTP/1.1 100 Continue\r\n\
-                    \r\n\
-                    HTTP/1.1 200 OK\r\n\
-                    content-length: 7\r\n\
-                    connection: close\r\n\
-                    date: Thu, 01 Jan 1970 12:34:56 UTC\r\n\
-                    \r\n\
-                    /upload\
-                    "
-            );
-        }
-    })
-    .await;
-}
-
-#[actix_rt::test]
-async fn upgrade_handling() {
-    struct TestUpgrade;
-
-    impl<T> Service<(Request, Framed<T, Codec>)> for TestUpgrade {
-        type Response = ();
-        type Error = Error;
-        type Future = Ready<Result<Self::Response, Self::Error>>;
-
-        actix_service::always_ready!();
-
-        fn call(&self, (req, _framed): (Request, Framed<T, Codec>)) -> Self::Future {
-            assert_eq!(req.method(), Method::GET);
-            assert!(req.upgrade());
-            assert_eq!(req.headers().get("upgrade").unwrap(), "websocket");
-            ready(Ok(()))
-        }
-    }
-
-    lazy(|cx| {
-        let mut buf = TestSeqBuffer::empty();
-        let cfg = ServiceConfig::new(
-            KeepAlive::Disabled,
-            Duration::ZERO,
-            Duration::ZERO,
-            false,
-            None,
-        );
-
-        let services = HttpFlow::new(ok_service(), ExpectHandler, Some(TestUpgrade));
-
-        let h1 = Dispatcher::<_, _, _, _, TestUpgrade>::new(
-            buf.clone(),
-            services,
-            cfg,
-            None,
-            OnConnectData::default(),
-        );
-
-        buf.extend_read_buf(
-            "\
-                GET /ws HTTP/1.1\r\n\
-                Connection: Upgrade\r\n\
-                Upgrade: websocket\r\n\
-                \r\n\
-                ",
-        );
-
-        pin!(h1);
-
-        assert!(h1.as_mut().poll(cx).is_ready());
-        assert!(matches!(&h1.inner, DispatcherState::Upgrade { .. }));
-
-        // polls: manual shutdown
-        assert_eq!(h1.poll_count, 2);
-    })
-    .await;
-}
-
-// fix in #2624 reverted temporarily
-// complete fix tracked in #2745
-#[ignore]
-#[actix_rt::test]
-async fn handler_drop_payload() {
-    let _ = env_logger::try_init();
-
-    let mut buf = TestBuffer::new(http_msg(
-        r"
-        POST /drop-payload HTTP/1.1
-        Content-Length: 3
-        
-        abc
-        ",
-    ));
-
-    let services = HttpFlow::new(
-        drop_payload_service(),
-        ExpectHandler,
-        None::<UpgradeHandler>,
-    );
-
-    let h1 = Dispatcher::new(
-        buf.clone(),
-        services,
-        ServiceConfig::default(),
-        None,
-        OnConnectData::default(),
-    );
-    pin!(h1);
-
-    lazy(|cx| {
-        assert!(h1.as_mut().poll(cx).is_pending());
-
-        // polls: manual
-        assert_eq!(h1.poll_count, 1);
-
-        let mut res = BytesMut::from(buf.take_write_buf().as_ref());
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        let exp = http_msg(
-            r"
-            HTTP/1.1 200 OK
-            content-length: 15
-            date: Thu, 01 Jan 1970 12:34:56 UTC
-
-            payload dropped
-            ",
-        );
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(&exp)
-        );
-
-        if let DispatcherStateProj::Normal { inner } = h1.as_mut().project().inner.project() {
-            assert!(inner.state.is_none());
-        }
-    })
-    .await;
-
-    lazy(|cx| {
-        // add message that claims to have payload longer than provided
-        buf.extend_read_buf(http_msg(
-            r"
-            POST /drop-payload HTTP/1.1
-            Content-Length: 200
-            
-            abc
-            ",
-        ));
-
-        assert!(h1.as_mut().poll(cx).is_pending());
-
-        // polls: manual => manual
-        assert_eq!(h1.poll_count, 2);
-
-        let mut res = BytesMut::from(buf.take_write_buf().as_ref());
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        // expect response immediately even though request side has not finished reading payload
-        let exp = http_msg(
-            r"
-            HTTP/1.1 200 OK
-            content-length: 15
-            date: Thu, 01 Jan 1970 12:34:56 UTC
-
-            payload dropped
-            ",
-        );
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(&exp)
-        );
-    })
-    .await;
-
-    lazy(|cx| {
-        assert!(h1.as_mut().poll(cx).is_ready());
-
-        // polls: manual => manual => manual
-        assert_eq!(h1.poll_count, 3);
-
-        let mut res = BytesMut::from(buf.take_write_buf().as_ref());
-        stabilize_date_header(&mut res);
-        let res = &res[..];
-
-        // expect that unrequested error response is sent back since connection could not be cleaned
-        let exp = http_msg(
-            r"
-            HTTP/1.1 500 Internal Server Error
-            content-length: 0
-            connection: close
-            date: Thu, 01 Jan 1970 12:34:56 UTC
-
-            ",
-        );
-
-        assert_eq!(
-            res,
-            exp,
-            "\nexpected response not in write buffer:\n\
-               response: {:?}\n\
-               expected: {:?}",
-            String::from_utf8_lossy(res),
-            String::from_utf8_lossy(&exp)
-        );
-    })
-    .await;
-}
-
-fn http_msg(msg: impl AsRef<str>) -> BytesMut {
-    let mut msg = msg
-        .as_ref()
-        .trim()
-        .split('\n')
-        .map(|line| [line.trim_start(), "\r"].concat())
-        .collect::<Vec<_>>()
-        .join("\n");
-
-    // remove trailing \r
-    msg.pop();
-
-    if !msg.is_empty() && !msg.contains("\r\n\r\n") {
-        msg.push_str("\r\n\r\n");
-    }
-
-    BytesMut::from(msg.as_bytes())
-}
-
-#[test]
-fn http_msg_creates_msg() {
-    assert_eq!(http_msg(r""), "");
-
-    assert_eq!(
-        http_msg(
-            r"
-            POST / HTTP/1.1
-            Content-Length: 3
-            
-            abc
-            "
-        ),
-        "POST / HTTP/1.1\r\nContent-Length: 3\r\n\r\nabc"
-    );
-
-    assert_eq!(
-        http_msg(
-            r"
-            GET / HTTP/1.1
-            Content-Length: 3
-            
-            "
-        ),
-        "GET / HTTP/1.1\r\nContent-Length: 3\r\n\r\n"
-    );
-}

actix-http/src/h1/encoder.rs

@@ -1,19 +1,19 @@
-use std::{
+use std::io::Write;
-    cmp,
+use std::marker::PhantomData;
-    io::{self, Write as _},
+use std::ptr::copy_nonoverlapping;
-    marker::PhantomData,
+use std::slice::from_raw_parts_mut;
-    ptr::copy_nonoverlapping,
+use std::{cmp, io};
-    slice::from_raw_parts_mut,
-};
 
 use bytes::{BufMut, BytesMut};
 
 use crate::{
     body::BodySize,
-    header::{
+    config::ServiceConfig,
-        map::Value, HeaderMap, HeaderName, CONNECTION, CONTENT_LENGTH, DATE, TRANSFER_ENCODING,
+    header::{map::Value, HeaderMap, HeaderName},
-    },
+    header::{CONNECTION, CONTENT_LENGTH, DATE, TRANSFER_ENCODING},
-    helpers, ConnectionType, RequestHeadType, Response, ServiceConfig, StatusCode, Version,
+    helpers,
+    message::{ConnectionType, RequestHeadType},
+    Response, StatusCode, Version,
 };
 
 const AVERAGE_HEADER_SIZE: usize = 30;
@@ -71,16 +71,15 @@ pub(crate) trait MessageType: Sized {
                 | StatusCode::PROCESSING
                 | StatusCode::NO_CONTENT => {
                     // skip content-length and transfer-encoding headers
-                    // see https://datatracker.ietf.org/doc/html/rfc7230#section-3.3.1
+                    // see https://tools.ietf.org/html/rfc7230#section-3.3.1
-                    // and https://datatracker.ietf.org/doc/html/rfc7230#section-3.3.2
+                    // and https://tools.ietf.org/html/rfc7230#section-3.3.2
                     skip_len = true;
                     length = BodySize::None
                 }
 
                 StatusCode::NOT_MODIFIED => {
                     // 304 responses should never have a body but should retain a manually set
-                    // content-length header
+                    // content-length header see https://tools.ietf.org/html/rfc7232#section-4.1
-                    // see https://datatracker.ietf.org/doc/html/rfc7232#section-4.1
                     skip_len = false;
                     length = BodySize::None;
                 }
@@ -103,9 +102,11 @@ pub(crate) trait MessageType: Sized {
                     dst.put_slice(b"\r\n");
                 }
             }
-            BodySize::Sized(0) if camel_case => dst.put_slice(b"\r\nContent-Length: 0\r\n"),
+            BodySize::Sized(0) if camel_case => {
+                dst.put_slice(b"\r\nContent-Length: 0\r\n")
+            }
             BodySize::Sized(0) => dst.put_slice(b"\r\ncontent-length: 0\r\n"),
-            BodySize::Sized(len) => helpers::write_content_length(len, dst, camel_case),
+            BodySize::Sized(len) => helpers::write_content_length(len, dst),
             BodySize::None => dst.put_slice(b"\r\n"),
         }
 
@@ -152,6 +153,7 @@ pub(crate) trait MessageType: Sized {
             let k = key.as_str().as_bytes();
             let k_len = k.len();
 
+            // TODO: drain?
             for val in value.iter() {
                 let v = val.as_ref();
                 let v_len = v.len();
@@ -210,13 +212,13 @@ pub(crate) trait MessageType: Sized {
             dst.advance_mut(pos);
         }
 
+        // optimized date header, set_date writes \r\n
         if !has_date {
-            // optimized date header, write_date_header writes its own \r\n
+            config.set_date(dst);
-            config.write_date_header(dst, camel_case);
+        } else {
-        }
+            // msg eof
-
-        // end-of-headers marker
             dst.extend_from_slice(b"\r\n");
+        }
 
         Ok(())
     }
@@ -257,12 +259,6 @@ impl MessageType for Response<()> {
         None
     }
 
-    fn camel_case(&self) -> bool {
-        self.head()
-            .flags
-            .contains(crate::message::Flags::CAMEL_CASE)
-    }
-
     fn encode_status(&mut self, dst: &mut BytesMut) -> io::Result<()> {
         let head = self.head();
         let reason = head.reason().as_bytes();
@@ -310,25 +306,28 @@ impl MessageType for RequestHeadType {
                 Version::HTTP_11 => "HTTP/1.1",
                 Version::HTTP_2 => "HTTP/2.0",
                 Version::HTTP_3 => "HTTP/3.0",
-                _ => return Err(io::Error::new(io::ErrorKind::Other, "unsupported version")),
+                _ =>
+                    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))
     }
 }
 
 impl<T: MessageType> MessageEncoder<T> {
-    /// Encode chunk.
+    /// Encode message
     pub fn encode_chunk(&mut self, msg: &[u8], buf: &mut BytesMut) -> io::Result<bool> {
         self.te.encode(msg, buf)
     }
 
-    /// Encode EOF.
+    /// Encode eof
     pub fn encode_eof(&mut self, buf: &mut BytesMut) -> io::Result<()> {
         self.te.encode_eof(buf)
     }
 
-    /// Encode message.
     pub fn encode(
         &mut self,
         dst: &mut BytesMut,
@@ -433,7 +432,7 @@ impl TransferEncoding {
                     buf.extend_from_slice(b"0\r\n\r\n");
                 } else {
                     writeln!(helpers::MutWriter(buf), "{:X}\r", msg.len())
-                        .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
+                        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
 
                     buf.reserve(msg.len() + 2);
                     buf.extend_from_slice(msg);
@@ -450,7 +449,7 @@ impl TransferEncoding {
 
                     buf.extend_from_slice(&msg[..len as usize]);
 
-                    *remaining -= len;
+                    *remaining -= len as u64;
                     Ok(*remaining == 0)
                 } else {
                     Ok(true)
@@ -517,7 +516,6 @@ unsafe fn write_camel_case(value: &[u8], buf: *mut u8, len: usize) {
             if let Some(c @ b'a'..=b'z') = iter.next() {
                 buffer[index] = c & 0b1101_1111;
             }
-            index += 1;
         }
 
         index += 1;
@@ -529,13 +527,11 @@ mod tests {
     use std::rc::Rc;
 
     use bytes::Bytes;
-    use http::header::{AUTHORIZATION, UPGRADE_INSECURE_REQUESTS};
+    use http::header::AUTHORIZATION;
 
     use super::*;
-    use crate::{
+    use crate::http::header::{HeaderValue, CONTENT_TYPE};
-        header::{HeaderValue, CONTENT_TYPE},
+    use crate::RequestHead;
-        RequestHead,
-    };
 
     #[test]
     fn test_chunked_te() {
@@ -560,9 +556,6 @@ mod tests {
         head.headers
             .insert(CONTENT_TYPE, HeaderValue::from_static("plain/text"));
 
-        head.headers
-            .insert(UPGRADE_INSECURE_REQUESTS, HeaderValue::from_static("1"));
-
         let mut head = RequestHeadType::Owned(head);
 
         let _ = head.encode_headers(
@@ -572,13 +565,13 @@ mod tests {
             ConnectionType::Close,
             &ServiceConfig::default(),
         );
-        let data = String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
+        let data =
+            String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
 
         assert!(data.contains("Content-Length: 0\r\n"));
         assert!(data.contains("Connection: close\r\n"));
         assert!(data.contains("Content-Type: plain/text\r\n"));
         assert!(data.contains("Date: date\r\n"));
-        assert!(data.contains("Upgrade-Insecure-Requests: 1\r\n"));
 
         let _ = head.encode_headers(
             &mut bytes,
@@ -587,7 +580,8 @@ mod tests {
             ConnectionType::KeepAlive,
             &ServiceConfig::default(),
         );
-        let data = String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
+        let data =
+            String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
         assert!(data.contains("Transfer-Encoding: chunked\r\n"));
         assert!(data.contains("Content-Type: plain/text\r\n"));
         assert!(data.contains("Date: date\r\n"));
@@ -608,7 +602,8 @@ mod tests {
             ConnectionType::KeepAlive,
             &ServiceConfig::default(),
         );
-        let data = String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
+        let data =
+            String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
         assert!(data.contains("transfer-encoding: chunked\r\n"));
         assert!(data.contains("content-type: xml\r\n"));
         assert!(data.contains("content-type: plain/text\r\n"));
@@ -641,7 +636,8 @@ mod tests {
             ConnectionType::Close,
             &ServiceConfig::default(),
         );
-        let data = String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
+        let data =
+            String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
         assert!(data.contains("content-length: 0\r\n"));
         assert!(data.contains("connection: close\r\n"));
         assert!(data.contains("authorization: another authorization\r\n"));
@@ -664,7 +660,8 @@ mod tests {
             ConnectionType::Upgrade,
             &ServiceConfig::default(),
         );
-        let data = String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
+        let data =
+            String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
         assert!(!data.contains("content-length: 0\r\n"));
         assert!(!data.contains("transfer-encoding: chunked\r\n"));
     }

actix-http/src/h1/expect.rs

@@ -1,7 +1,8 @@
 use actix_service::{Service, ServiceFactory};
 use actix_utils::future::{ready, Ready};
 
-use crate::{Error, Request};
+use crate::error::Error;
+use crate::request::Request;
 
 pub struct ExpectHandler;
 

actix-http/src/h1/mod.rs

@@ -7,34 +7,28 @@ mod client;
 mod codec;
 mod decoder;
 mod dispatcher;
-#[cfg(test)]
-mod dispatcher_tests;
 mod encoder;
 mod expect;
 mod payload;
 mod service;
-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
 pub enum Message<T> {
-    /// HTTP message.
+    /// Http message
     Item(T),
-
+    /// Payload chunk
-    /// Payload chunk.
     Chunk(Option<Bytes>),
 }
 
@@ -65,7 +59,7 @@ pub(crate) fn reserve_readbuf(src: &mut BytesMut) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::Request;
+    use crate::request::Request;
 
     impl Message<Request> {
         pub fn message(self) -> Request {

actix-http/src/h1/payload.rs

@@ -1,12 +1,9 @@
 //! Payload stream
-
+use std::cell::RefCell;
-use std::{
+use std::collections::VecDeque;
-    cell::RefCell,
+use std::pin::Pin;
-    collections::VecDeque,
+use std::rc::{Rc, Weak};
-    pin::Pin,
+use std::task::{Context, Poll, Waker};
-    rc::{Rc, Weak},
-    task::{Context, Poll, Waker},
-};
 
 use bytes::Bytes;
 use futures_core::Stream;
@@ -16,7 +13,7 @@ use crate::error::PayloadError;
 /// max buffer size 32k
 pub(crate) const MAX_BUFFER_SIZE: usize = 32_768;
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq)]
 pub enum PayloadStatus {
     Read,
     Pause,
@@ -25,32 +22,39 @@ pub enum PayloadStatus {
 
 /// Buffered stream of bytes chunks
 ///
-/// Payload stores chunks in a vector. First chunk can be received with `poll_next`. Payload does
+/// Payload stores chunks in a vector. First chunk can be received with
-/// not notify current task when new data is available.
+/// `.readany()` method. Payload stream is not thread safe. Payload does not
+/// notify current task when new data is available.
 ///
-/// Payload can be used as `Response` body stream.
+/// Payload stream can be used as `Response` body stream.
 #[derive(Debug)]
 pub struct Payload {
     inner: Rc<RefCell<Inner>>,
 }
 
 impl Payload {
-    /// Creates a payload stream.
+    /// Create payload stream.
     ///
-    /// This method construct two objects responsible for bytes stream generation:
+    /// This method construct two objects responsible for bytes stream
-    /// - `PayloadSender` - *Sender* side of the stream
+    /// generation.
-    /// - `Payload` - *Receiver* side of the stream
+    ///
+    /// * `PayloadSender` - *Sender* side of the stream
+    ///
+    /// * `Payload` - *Receiver* side of the stream
     pub fn create(eof: bool) -> (PayloadSender, Payload) {
         let shared = Rc::new(RefCell::new(Inner::new(eof)));
 
         (
-            PayloadSender::new(Rc::downgrade(&shared)),
+            PayloadSender {
+                inner: Rc::downgrade(&shared),
+            },
             Payload { inner: shared },
         )
     }
 
-    /// Creates an empty payload.
+    /// Create empty payload
-    pub(crate) fn empty() -> Payload {
+    #[doc(hidden)]
+    pub fn empty() -> Payload {
         Payload {
             inner: Rc::new(RefCell::new(Inner::new(true))),
         }
@@ -73,6 +77,14 @@ impl Payload {
     pub fn unread_data(&mut self, data: Bytes) {
         self.inner.borrow_mut().unread_data(data);
     }
+
+    #[inline]
+    pub fn readany(
+        &mut self,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<Bytes, PayloadError>>> {
+        self.inner.borrow_mut().readany(cx)
+    }
 }
 
 impl Stream for Payload {
@@ -82,7 +94,7 @@ impl Stream for Payload {
         self: Pin<&mut Self>,
         cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, PayloadError>>> {
-        Pin::new(&mut *self.inner.borrow_mut()).poll_next(cx)
+        self.inner.borrow_mut().readany(cx)
     }
 }
 
@@ -92,10 +104,6 @@ pub struct PayloadSender {
 }
 
 impl PayloadSender {
-    fn new(inner: Weak<RefCell<Inner>>) -> Self {
-        Self { inner }
-    }
-
     #[inline]
     pub fn set_error(&mut self, err: PayloadError) {
         if let Some(shared) = self.inner.upgrade() {
@@ -117,7 +125,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 +182,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 +194,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()
@@ -220,9 +227,9 @@ impl Inner {
         self.len
     }
 
-    fn poll_next(
+    fn readany(
-        mut self: Pin<&mut Self>,
+        &mut self,
-        cx: &Context<'_>,
+        cx: &mut Context<'_>,
     ) -> Poll<Option<Result<Bytes, PayloadError>>> {
         if let Some(data) = self.items.pop_front() {
             self.len -= data.len();
@@ -253,15 +260,8 @@ impl Inner {
 
 #[cfg(test)]
 mod tests {
-    use actix_utils::future::poll_fn;
-    use static_assertions::{assert_impl_all, assert_not_impl_any};
-
     use super::*;
-
+    use actix_utils::future::poll_fn;
-    assert_impl_all!(Payload: Unpin);
-    assert_not_impl_any!(Payload: Send, Sync);
-
-    assert_impl_all!(Inner: Unpin, Send, Sync);
 
     #[actix_rt::test]
     async fn test_unread_data() {
@@ -273,10 +273,7 @@ mod tests {
 
         assert_eq!(
             Bytes::from("data"),
-            poll_fn(|cx| Pin::new(&mut payload).poll_next(cx))
+            poll_fn(|cx| payload.readany(cx)).await.unwrap().unwrap()
-                .await
-                .unwrap()
-                .unwrap()
         );
     }
 }

actix-http/src/h1/service.rs

@@ -1,4 +1,5 @@
 use std::{
+    error::Error as StdError,
     fmt,
     marker::PhantomData,
     net,
@@ -13,17 +14,17 @@ use actix_service::{
 };
 use actix_utils::future::ready;
 use futures_core::future::LocalBoxFuture;
-use tracing::error;
 
-use super::{codec::Codec, dispatcher::Dispatcher, ExpectHandler, UpgradeHandler};
 use crate::{
-    body::{BoxBody, MessageBody},
+    body::{AnyBody, MessageBody},
     config::ServiceConfig,
     error::DispatchError,
     service::HttpServiceHandler,
     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,
@@ -37,7 +38,7 @@ pub struct H1Service<T, S, B, X = ExpectHandler, U = UpgradeHandler> {
 impl<T, S, B> H1Service<T, S, B>
 where
     S: ServiceFactory<Request, Config = ()>,
-    S::Error: Into<Response<BoxBody>>,
+    S::Error: Into<Response<AnyBody>>,
     S::InitError: fmt::Debug,
     S::Response: Into<Response<B>>,
     B: MessageBody,
@@ -62,27 +63,33 @@ impl<S, B, X, U> H1Service<TcpStream, S, B, X, U>
 where
     S: ServiceFactory<Request, Config = ()>,
     S::Future: 'static,
-    S::Error: Into<Response<BoxBody>>,
+    S::Error: Into<Response<AnyBody>>,
     S::InitError: fmt::Debug,
     S::Response: Into<Response<B>>,
 
     B: MessageBody,
+    B::Error: Into<Box<dyn StdError>>,
 
     X: ServiceFactory<Request, Config = (), Response = Request>,
     X::Future: 'static,
-    X::Error: Into<Response<BoxBody>>,
+    X::Error: Into<Response<AnyBody>>,
     X::InitError: fmt::Debug,
 
     U: ServiceFactory<(Request, Framed<TcpStream, Codec>), Config = (), Response = ()>,
     U::Future: 'static,
-    U::Error: fmt::Display + Into<Response<BoxBody>>,
+    U::Error: fmt::Display + Into<Response<AnyBody>>,
     U::InitError: fmt::Debug,
 {
     /// 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 +100,8 @@ where
 
 #[cfg(feature = "openssl")]
 mod openssl {
+    use super::*;
+
     use actix_tls::accept::{
         openssl::{
             reexports::{Error as SslError, SslAcceptor},
@@ -101,21 +110,20 @@ mod openssl {
         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::Error: Into<Response<AnyBody>>,
         S::InitError: fmt::Debug,
         S::Response: Into<Response<B>>,
 
         B: MessageBody,
+        B::Error: Into<Box<dyn StdError>>,
 
         X: ServiceFactory<Request, Config = (), Response = Request>,
         X::Future: 'static,
-        X::Error: Into<Response<BoxBody>>,
+        X::Error: Into<Response<AnyBody>>,
         X::InitError: fmt::Debug,
 
         U: ServiceFactory<
@@ -124,7 +132,7 @@ mod openssl {
             Response = (),
         >,
         U::Future: 'static,
-        U::Error: fmt::Display + Into<Response<BoxBody>>,
+        U::Error: fmt::Display + Into<Response<AnyBody>>,
         U::InitError: fmt::Debug,
     {
         /// Create OpenSSL based service.
@@ -152,13 +160,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,
     };
 
@@ -168,15 +177,16 @@ mod rustls_0_20 {
     where
         S: ServiceFactory<Request, Config = ()>,
         S::Future: 'static,
-        S::Error: Into<Response<BoxBody>>,
+        S::Error: Into<Response<AnyBody>>,
         S::InitError: fmt::Debug,
         S::Response: Into<Response<B>>,
 
         B: MessageBody,
+        B::Error: Into<Box<dyn StdError>>,
 
         X: ServiceFactory<Request, Config = (), Response = Request>,
         X::Future: 'static,
-        X::Error: Into<Response<BoxBody>>,
+        X::Error: Into<Response<AnyBody>>,
         X::InitError: fmt::Debug,
 
         U: ServiceFactory<
@@ -185,10 +195,10 @@ mod rustls_0_20 {
             Response = (),
         >,
         U::Future: 'static,
-        U::Error: fmt::Display + Into<Response<BoxBody>>,
+        U::Error: fmt::Display + Into<Response<AnyBody>>,
         U::InitError: fmt::Debug,
     {
-        /// Create Rustls v0.20 based service.
+        /// Create Rustls based service.
         pub fn rustls(
             self,
             config: ServerConfig,
@@ -213,193 +223,10 @@ 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 = ()>,
-    S::Error: Into<Response<BoxBody>>,
+    S::Error: Into<Response<AnyBody>>,
     S::Response: Into<Response<B>>,
     S::InitError: fmt::Debug,
     B: MessageBody,
@@ -407,7 +234,7 @@ where
     pub fn expect<X1>(self, expect: X1) -> H1Service<T, S, B, X1, U>
     where
         X1: ServiceFactory<Request, Response = Request>,
-        X1::Error: Into<Response<BoxBody>>,
+        X1::Error: Into<Response<AnyBody>>,
         X1::InitError: fmt::Debug,
     {
         H1Service {
@@ -443,26 +270,28 @@ where
     }
 }
 
-impl<T, S, B, X, U> ServiceFactory<(T, Option<net::SocketAddr>)> for H1Service<T, S, B, X, U>
+impl<T, S, B, X, U> ServiceFactory<(T, Option<net::SocketAddr>)>
+    for H1Service<T, S, B, X, U>
 where
     T: AsyncRead + AsyncWrite + Unpin + 'static,
 
     S: ServiceFactory<Request, Config = ()>,
     S::Future: 'static,
-    S::Error: Into<Response<BoxBody>>,
+    S::Error: Into<Response<AnyBody>>,
     S::Response: Into<Response<B>>,
     S::InitError: fmt::Debug,
 
     B: MessageBody,
+    B::Error: Into<Box<dyn StdError>>,
 
     X: ServiceFactory<Request, Config = (), Response = Request>,
     X::Future: 'static,
-    X::Error: Into<Response<BoxBody>>,
+    X::Error: Into<Response<AnyBody>>,
     X::InitError: fmt::Debug,
 
     U: ServiceFactory<(Request, Framed<T, Codec>), Config = (), Response = ()>,
     U::Future: 'static,
-    U::Error: fmt::Display + Into<Response<BoxBody>>,
+    U::Error: fmt::Display + Into<Response<AnyBody>>,
     U::InitError: fmt::Debug,
 {
     type Response = ();
@@ -480,14 +309,14 @@ where
         let cfg = self.cfg.clone();
 
         Box::pin(async move {
-            let expect = expect.await.map_err(|err| {
+            let expect = expect
-                tracing::error!("Initialization of HTTP expect service error: {err:?}");
+                .await
-            })?;
+                .map_err(|e| log::error!("Init http expect service error: {:?}", e))?;
 
             let upgrade = match upgrade {
                 Some(upgrade) => {
-                    let upgrade = upgrade.await.map_err(|err| {
+                    let upgrade = upgrade.await.map_err(|e| {
-                        tracing::error!("Initialization of HTTP upgrade service error: {err:?}");
+                        log::error!("Init http upgrade service error: {:?}", e)
                     })?;
                     Some(upgrade)
                 }
@@ -496,7 +325,7 @@ where
 
             let service = service
                 .await
-                .map_err(|err| error!("Initialization of HTTP service error: {err:?}"))?;
+                .map_err(|e| log::error!("Init http service error: {:?}", e))?;
 
             Ok(H1ServiceHandler::new(
                 cfg,
@@ -512,35 +341,45 @@ where
 /// `Service` implementation for HTTP/1 transport
 pub type H1ServiceHandler<T, S, B, X, U> = HttpServiceHandler<T, S, B, X, U>;
 
-impl<T, S, B, X, U> Service<(T, Option<net::SocketAddr>)> for HttpServiceHandler<T, S, B, X, U>
+impl<T, S, B, X, U> Service<(T, Option<net::SocketAddr>)>
+    for HttpServiceHandler<T, S, B, X, U>
 where
     T: AsyncRead + AsyncWrite + Unpin,
 
     S: Service<Request>,
-    S::Error: Into<Response<BoxBody>>,
+    S::Error: Into<Response<AnyBody>>,
     S::Response: Into<Response<B>>,
 
     B: MessageBody,
+    B::Error: Into<Box<dyn StdError>>,
 
     X: Service<Request, Response = Request>,
-    X::Error: Into<Response<BoxBody>>,
+    X::Error: Into<Response<AnyBody>>,
 
     U: Service<(Request, Framed<T, Codec>), Response = ()>,
-    U::Error: fmt::Display + Into<Response<BoxBody>>,
+    U::Error: fmt::Display + Into<Response<AnyBody>>,
 {
     type Response = ();
     type Error = DispatchError;
     type Future = Dispatcher<T, S, B, X, U>;
 
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self._poll_ready(cx).map_err(|err| {
+        self._poll_ready(cx).map_err(|e| {
-            error!("HTTP/1 service readiness error: {:?}", err);
+            log::error!("HTTP/1 service readiness error: {:?}", e);
-            DispatchError::Service(err)
+            DispatchError::Service(e)
         })
     }
 
     fn call(&self, (io, addr): (T, Option<net::SocketAddr>)) -> Self::Future {
-        let conn_data = OnConnectData::from_io(&io, self.on_connect_ext.as_deref());
+        let on_connect_data =
-        Dispatcher::new(io, Rc::clone(&self.flow), self.cfg.clone(), addr, conn_data)
+            OnConnectData::from_io(&io, self.on_connect_ext.as_deref());
+
+        Dispatcher::new(
+            io,
+            self.cfg.clone(),
+            self.flow.clone(),
+            on_connect_data,
+            addr,
+        )
     }
 }

actix-http/src/h1/timer.rs

@@ -1,81 +0,0 @@
-use std::{fmt, future::Future, pin::Pin, task::Context};
-
-use actix_rt::time::{Instant, Sleep};
-use tracing::trace;
-
-#[derive(Debug)]
-pub(super) enum TimerState {
-    Disabled,
-    Inactive,
-    Active { timer: Pin<Box<Sleep>> },
-}
-
-impl TimerState {
-    pub(super) fn new(enabled: bool) -> Self {
-        if enabled {
-            Self::Inactive
-        } else {
-            Self::Disabled
-        }
-    }
-
-    pub(super) fn is_enabled(&self) -> bool {
-        matches!(self, Self::Active { .. } | Self::Inactive)
-    }
-
-    pub(super) fn set(&mut self, timer: Sleep, line: u32) {
-        if matches!(self, Self::Disabled) {
-            trace!("setting disabled timer from line {}", line);
-        }
-
-        *self = Self::Active {
-            timer: Box::pin(timer),
-        };
-    }
-
-    pub(super) fn set_and_init(&mut self, cx: &mut Context<'_>, timer: Sleep, line: u32) {
-        self.set(timer, line);
-        self.init(cx);
-    }
-
-    pub(super) fn clear(&mut self, line: u32) {
-        if matches!(self, Self::Disabled) {
-            trace!("trying to clear a disabled timer from line {}", line);
-        }
-
-        if matches!(self, Self::Inactive) {
-            trace!("trying to clear an inactive timer from line {}", line);
-        }
-
-        *self = Self::Inactive;
-    }
-
-    pub(super) fn init(&mut self, cx: &mut Context<'_>) {
-        if let TimerState::Active { timer } = self {
-            let _ = timer.as_mut().poll(cx);
-        }
-    }
-}
-
-impl fmt::Display for TimerState {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            TimerState::Disabled => f.write_str("timer is disabled"),
-            TimerState::Inactive => f.write_str("timer is inactive"),
-            TimerState::Active { timer } => {
-                let deadline = timer.deadline();
-                let now = Instant::now();
-
-                if deadline < now {
-                    f.write_str("timer is active and has reached deadline")
-                } else {
-                    write!(
-                        f,
-                        "timer is active and due to expire in {} milliseconds",
-                        ((deadline - now).as_secs_f32() * 1000.0)
-                    )
-                }
-            }
-        }
-    }
-}

actix-http/src/h1/upgrade.rs

@@ -2,7 +2,9 @@ use actix_codec::Framed;
 use actix_service::{Service, ServiceFactory};
 use futures_core::future::LocalBoxFuture;
 
-use crate::{h1::Codec, Error, Request};
+use crate::error::Error;
+use crate::h1::Codec;
+use crate::request::Request;
 
 pub struct UpgradeHandler;
 

actix-http/src/h1/utils.rs

@@ -1,29 +1,22 @@
-use std::{
+use std::future::Future;
-    future::Future,
+use std::pin::Pin;
-    pin::Pin,
+use std::task::{Context, Poll};
-    task::{Context, Poll},
-};
 
 use actix_codec::{AsyncRead, AsyncWrite, Framed};
-use pin_project_lite::pin_project;
 
-use crate::{
+use crate::body::{BodySize, MessageBody};
-    body::{BodySize, MessageBody},
+use crate::error::Error;
-    h1::{Codec, Message},
+use crate::h1::{Codec, Message};
-    Error, Response,
+use crate::response::Response;
-};
 
-pin_project! {
+/// Send HTTP/1 response
-    /// Send HTTP/1 response
+#[pin_project::pin_project]
-    pub struct SendResponse<T, B> {
+pub struct SendResponse<T, B> {
     res: Option<Message<(Response<()>, BodySize)>>,
-
     #[pin]
     body: Option<B>,
-
     #[pin]
     framed: Option<Framed<T, Codec>>,
-    }
 }
 
 impl<T, B> SendResponse<T, B>
@@ -45,7 +38,7 @@ where
 impl<T, B> Future for SendResponse<T, B>
 where
     T: AsyncRead + AsyncWrite + Unpin,
-    B: MessageBody,
+    B: MessageBody + Unpin,
     B::Error: Into<Error>,
 {
     type Output = Result<Framed<T, Codec>, Error>;
@@ -69,9 +62,12 @@ where
                         .unwrap()
                         .is_write_buf_full()
                 {
-                    let next = match this.body.as_mut().as_pin_mut().unwrap().poll_next(cx) {
+                    let next =
+                        match this.body.as_mut().as_pin_mut().unwrap().poll_next(cx) {
                             Poll::Ready(Some(Ok(item))) => Poll::Ready(Some(item)),
-                        Poll::Ready(Some(Err(err))) => return Poll::Ready(Err(err.into())),
+                            Poll::Ready(Some(Err(err))) => {
+                                return Poll::Ready(Err(err.into()))
+                            }
                             Poll::Ready(None) => Poll::Ready(None),
                             Poll::Pending => Poll::Pending,
                         };
@@ -81,12 +77,12 @@ where
                             // body is done when item is None
                             body_done = item.is_none();
                             if body_done {
-                                this.body.set(None);
+                                let _ = this.body.take();
                             }
                             let framed = this.framed.as_mut().as_pin_mut().unwrap();
-                            framed
+                            framed.write(Message::Chunk(item)).map_err(|err| {
-                                .write(Message::Chunk(item))
+                                Error::new_send_response().with_cause(err)
-                                .map_err(|err| Error::new_send_response().with_cause(err))?;
+                            })?;
                         }
                         Poll::Pending => body_ready = false,
                     }

actix-http/src/h2/dispatcher.rs

@@ -4,13 +4,13 @@ use std::{
     future::Future,
     marker::PhantomData,
     net,
-    pin::{pin, Pin},
+    pin::Pin,
     rc::Rc,
     task::{Context, Poll},
 };
 
 use actix_codec::{AsyncRead, AsyncWrite};
-use actix_rt::time::{sleep, Sleep};
+use actix_rt::time::Sleep;
 use actix_service::Service;
 use actix_utils::future::poll_fn;
 use bytes::{Bytes, BytesMut};
@@ -19,16 +19,15 @@ use h2::{
     server::{Connection, SendResponse},
     Ping, PingPong,
 };
+use http::header::{HeaderValue, CONNECTION, CONTENT_LENGTH, DATE, TRANSFER_ENCODING};
+use log::{error, trace};
 use pin_project_lite::pin_project;
 
 use crate::{
-    body::{BodySize, BoxBody, MessageBody},
+    body::{AnyBody, BodySize, MessageBody},
     config::ServiceConfig,
-    header::{
-        HeaderName, HeaderValue, CONNECTION, CONTENT_LENGTH, DATE, TRANSFER_ENCODING, UPGRADE,
-    },
     service::HttpFlow,
-    Extensions, Method, OnConnectData, Payload, Request, Response, ResponseHead,
+    OnConnectData, Payload, Request, Response, ResponseHead,
 };
 
 const CHUNK_SIZE: usize = 16_384;
@@ -38,7 +37,7 @@ pin_project! {
     pub struct Dispatcher<T, S, B, X, U> {
         flow: Rc<HttpFlow<S, X, U>>,
         connection: Connection<T, Bytes>,
-        conn_data: Option<Rc<Extensions>>,
+        on_connect_data: OnConnectData,
         config: ServiceConfig,
         peer_addr: Option<net::SocketAddr>,
         ping_pong: Option<H2PingPong>,
@@ -51,31 +50,24 @@ where
     T: AsyncRead + AsyncWrite + Unpin,
 {
     pub(crate) fn new(
-        mut conn: Connection<T, Bytes>,
         flow: Rc<HttpFlow<S, X, U>>,
+        mut connection: Connection<T, Bytes>,
+        on_connect_data: OnConnectData,
         config: ServiceConfig,
         peer_addr: Option<net::SocketAddr>,
-        conn_data: OnConnectData,
-        timer: Option<Pin<Box<Sleep>>>,
     ) -> Self {
-        let ping_pong = config.keep_alive().duration().map(|dur| H2PingPong {
+        let ping_pong = config.keep_alive_timer().map(|timer| H2PingPong {
-            timer: timer
+            timer: Box::pin(timer),
-                .map(|mut timer| {
+            on_flight: false,
-                    // reuse timer slot if it was initialized for handshake
+            ping_pong: connection.ping_pong().unwrap(),
-                    timer.as_mut().reset((config.now() + dur).into());
-                    timer
-                })
-                .unwrap_or_else(|| Box::pin(sleep(dur))),
-            in_flight: false,
-            ping_pong: conn.ping_pong().unwrap(),
         });
 
         Self {
             flow,
             config,
             peer_addr,
-            connection: conn,
+            connection,
-            conn_data: conn_data.0.map(Rc::new),
+            on_connect_data,
             ping_pong,
             _phantom: PhantomData,
         }
@@ -83,14 +75,9 @@ where
 }
 
 struct H2PingPong {
-    /// Handle to send ping frames from the peer.
-    ping_pong: PingPong,
-
-    /// True when a ping has been sent and is waiting for a reply.
-    in_flight: bool,
-
-    /// Timeout for pong response.
     timer: Pin<Box<Sleep>>,
+    on_flight: bool,
+    ping_pong: PingPong,
 }
 
 impl<T, S, B, X, U> Future for Dispatcher<T, S, B, X, U>
@@ -98,11 +85,12 @@ where
     T: AsyncRead + AsyncWrite + Unpin,
 
     S: Service<Request>,
-    S::Error: Into<Response<BoxBody>>,
+    S::Error: Into<Response<AnyBody>>,
     S::Future: 'static,
     S::Response: Into<Response<B>>,
 
     B: MessageBody,
+    B::Error: Into<Box<dyn StdError>>,
 {
     type Output = Result<(), crate::error::DispatchError>;
 
@@ -114,10 +102,9 @@ where
             match Pin::new(&mut this.connection).poll_accept(cx)? {
                 Poll::Ready(Some((req, tx))) => {
                     let (parts, body) = req.into_parts();
-                    let payload = crate::h2::Payload::new(body);
+                    let pl = crate::h2::Payload::new(body);
-                    let pl = Payload::H2 { payload };
+                    let pl = Payload::<crate::payload::PayloadStream>::H2(pl);
                     let mut req = Request::with_payload(pl);
-                    let head_req = parts.method == Method::HEAD;
 
                     let head = req.head_mut();
                     head.uri = parts.uri;
@@ -126,7 +113,8 @@ where
                     head.headers = parts.headers.into();
                     head.peer_addr = this.peer_addr;
 
-                    req.conn_data.clone_from(&this.conn_data);
+                    // merge on_connect_ext data into request extensions
+                    this.on_connect_data.merge_into(&mut req);
 
                     let fut = this.flow.service.call(req);
                     let config = this.config.clone();
@@ -135,10 +123,10 @@ where
                     actix_rt::spawn(async move {
                         // resolve service call and send response.
                         let res = match fut.await {
-                            Ok(res) => handle_response(res.into(), tx, config, head_req).await,
+                            Ok(res) => handle_response(res.into(), tx, config).await,
                             Err(err) => {
-                                let res: Response<BoxBody> = err.into();
+                                let res: Response<AnyBody> = err.into();
-                                handle_response(res, tx, config, head_req).await
+                                handle_response(res, tx, config).await
                             }
                         };
 
@@ -146,49 +134,50 @@ 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)
                                 }
                             }
                         }
                     });
                 }
                 Poll::Ready(None) => return Poll::Ready(Ok(())),
-
                 Poll::Pending => match this.ping_pong.as_mut() {
                     Some(ping_pong) => loop {
-                        if ping_pong.in_flight {
+                        if ping_pong.on_flight {
-                            // When there is an in-flight ping-pong, poll pong and and keep-alive
+                            // When have on flight ping pong. poll pong and and keep alive timer.
-                            // timer. On successful pong received, update keep-alive timer to
+                            // on success pong received update keep alive timer to determine the next timing of
-                            // determine the next timing of ping pong.
+                            // ping pong.
                             match ping_pong.ping_pong.poll_pong(cx)? {
                                 Poll::Ready(_) => {
-                                    ping_pong.in_flight = false;
+                                    ping_pong.on_flight = false;
 
-                                    let dead_line = this.config.keep_alive_deadline().unwrap();
+                                    let dead_line =
-                                    ping_pong.timer.as_mut().reset(dead_line.into());
+                                        this.config.keep_alive_expire().unwrap();
+                                    ping_pong.timer.as_mut().reset(dead_line);
                                 }
                                 Poll::Pending => {
-                                    return ping_pong.timer.as_mut().poll(cx).map(|_| Ok(()));
+                                    return ping_pong
+                                        .timer
+                                        .as_mut()
+                                        .poll(cx)
+                                        .map(|_| Ok(()))
                                 }
                             }
                         } else {
-                            // When there is no in-flight ping-pong, keep-alive timer is used to
+                            // When there is no on flight ping pong. keep alive timer is used to wait for next
-                            // wait for next timing of ping-pong. Therefore, at this point it serves
+                            // timing of ping pong. Therefore at this point it serves as an interval instead.
-                            // as an interval instead.
                             ready!(ping_pong.timer.as_mut().poll(cx));
 
                             ping_pong.ping_pong.send_ping(Ping::opaque())?;
 
-                            let dead_line = this.config.keep_alive_deadline().unwrap();
+                            let dead_line = this.config.keep_alive_expire().unwrap();
-                            ping_pong.timer.as_mut().reset(dead_line.into());
+                            ping_pong.timer.as_mut().reset(dead_line);
 
-                            ping_pong.in_flight = true;
+                            ping_pong.on_flight = true;
                         }
                     },
                     None => return Poll::Pending,
@@ -208,49 +197,46 @@ async fn handle_response<B>(
     res: Response<B>,
     mut tx: SendResponse<Bytes>,
     config: ServiceConfig,
-    head_req: bool,
 ) -> Result<(), DispatchError>
 where
     B: MessageBody,
+    B::Error: Into<Box<dyn StdError>>,
 {
     let (res, body) = res.replace_body(());
 
     // prepare response.
     let mut size = body.size();
     let res = prepare_response(config, res.head(), &mut size);
-    let eof_or_head = size.is_eof() || head_req;
+    let eof = size.is_eof();
 
     // send response head and return on eof.
     let mut stream = tx
-        .send_response(res, eof_or_head)
+        .send_response(res, eof)
         .map_err(DispatchError::SendResponse)?;
 
-    if eof_or_head {
+    if eof {
         return Ok(());
     }
 
-    let mut body = pin!(body);
+    // poll response body and send chunks to client.
+    actix_rt::pin!(body);
 
-    // poll response body and send chunks to client
     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()))?;
 
         'send: loop {
-            let chunk_size = cmp::min(chunk.len(), CHUNK_SIZE);
-
             // reserve enough space and wait for stream ready.
-            stream.reserve_capacity(chunk_size);
+            stream.reserve_capacity(cmp::min(chunk.len(), CHUNK_SIZE));
 
             match poll_fn(|cx| stream.poll_capacity(cx)).await {
                 // No capacity left. drop body and return.
                 None => return Ok(()),
+                Some(res) => {
+                    // Split chuck to writeable size and send to client.
+                    let cap = res.map_err(DispatchError::SendData)?;
 
-                Some(Err(err)) => return Err(DispatchError::SendData(err)),
-
-                Some(Ok(cap)) => {
-                    // split chunk to writeable size and send to client
                     let len = chunk.len();
-                    let bytes = chunk.split_to(cmp::min(len, cap));
+                    let bytes = chunk.split_to(cmp::min(cap, len));
 
                     stream
                         .send_data(bytes, false)
@@ -297,14 +283,12 @@ fn prepare_response(
         _ => {}
     }
 
-    match size {
+    let _ = match size {
-        BodySize::None | BodySize::Stream => {}
+        BodySize::None | BodySize::Stream => None,
 
-        BodySize::Sized(0) => {
+        BodySize::Sized(0) => res
-            #[allow(clippy::declare_interior_mutable_const)]
+            .headers_mut()
-            const HV_ZERO: HeaderValue = HeaderValue::from_static("0");
+            .insert(CONTENT_LENGTH, HeaderValue::from_static("0")),
-            res.headers_mut().insert(CONTENT_LENGTH, HV_ZERO);
-        }
 
         BodySize::Sized(len) => {
             let mut buf = itoa::Buffer::new();
@@ -312,28 +296,19 @@ fn prepare_response(
             res.headers_mut().insert(
                 CONTENT_LENGTH,
                 HeaderValue::from_str(buf.format(*len)).unwrap(),
-            );
+            )
         }
     };
 
     // copy headers
     for (key, value) in head.headers.iter() {
-        match key {
+        match *key {
-            // omit HTTP/1.x only headers according to:
+            // TODO: consider skipping other headers according to:
-            // https://datatracker.ietf.org/doc/html/rfc7540#section-8.1.2.2
+            //       https://tools.ietf.org/html/rfc7540#section-8.1.2.2
-            &CONNECTION | &TRANSFER_ENCODING | &UPGRADE => continue,
+            // omit HTTP/1.x only headers
-
+            CONNECTION | TRANSFER_ENCODING => continue,
-            &CONTENT_LENGTH if skip_len => continue,
+            CONTENT_LENGTH if skip_len => continue,
-            &DATE => has_date = true,
+            DATE => has_date = true,
-
-            // omit HTTP/1.x only headers according to:
-            // https://datatracker.ietf.org/doc/html/rfc7540#section-8.1.2.2
-            hdr if hdr == HeaderName::from_static("keep-alive")
-                || hdr == HeaderName::from_static("proxy-connection") =>
-            {
-                continue
-            }
-
             _ => {}
         }
 
@@ -343,7 +318,7 @@ fn prepare_response(
     // set date header
     if !has_date {
         let mut bytes = BytesMut::with_capacity(29);
-        config.write_date_header_value(&mut bytes);
+        config.set_date_header(&mut bytes);
         res.headers_mut().insert(
             DATE,
             // SAFETY: serialized date-times are known ASCII strings

actix-http/src/h2/mod.rs

@@ -1,29 +1,20 @@
 //! HTTP/2 protocol.
 
 use std::{
-    future::Future,
     pin::Pin,
     task::{Context, Poll},
 };
 
-use actix_codec::{AsyncRead, AsyncWrite};
-use actix_rt::time::{sleep_until, Sleep};
 use bytes::Bytes;
 use futures_core::{ready, Stream};
-use h2::{
+use h2::RecvStream;
-    server::{handshake, Connection, Handshake},
-    RecvStream,
-};
-
-use crate::{
-    config::ServiceConfig,
-    error::{DispatchError, PayloadError},
-};
 
 mod dispatcher;
 mod service;
 
-pub use self::{dispatcher::Dispatcher, service::H2Service};
+pub use self::dispatcher::Dispatcher;
+pub use self::service::H2Service;
+use crate::error::PayloadError;
 
 /// HTTP/2 peer stream.
 pub struct Payload {
@@ -39,7 +30,10 @@ impl Payload {
 impl Stream for Payload {
     type Item = Result<Bytes, PayloadError>;
 
-    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+    fn poll_next(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Self::Item>> {
         let this = self.get_mut();
 
         match ready!(Pin::new(&mut this.stream).poll_data(cx)) {
@@ -56,52 +50,3 @@ impl Stream for Payload {
         }
     }
 }
-
-pub(crate) fn handshake_with_timeout<T>(io: T, config: &ServiceConfig) -> HandshakeWithTimeout<T>
-where
-    T: AsyncRead + AsyncWrite + Unpin,
-{
-    HandshakeWithTimeout {
-        handshake: handshake(io),
-        timer: config
-            .client_request_deadline()
-            .map(|deadline| Box::pin(sleep_until(deadline.into()))),
-    }
-}
-
-pub(crate) struct HandshakeWithTimeout<T: AsyncRead + AsyncWrite + Unpin> {
-    handshake: Handshake<T>,
-    timer: Option<Pin<Box<Sleep>>>,
-}
-
-impl<T> Future for HandshakeWithTimeout<T>
-where
-    T: AsyncRead + AsyncWrite + Unpin,
-{
-    type Output = Result<(Connection<T, Bytes>, Option<Pin<Box<Sleep>>>), DispatchError>;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let this = self.get_mut();
-
-        match Pin::new(&mut this.handshake).poll(cx)? {
-            // return the timer on success handshake; its slot can be re-used for h2 ping-pong
-            Poll::Ready(conn) => Poll::Ready(Ok((conn, this.timer.take()))),
-            Poll::Pending => match this.timer.as_mut() {
-                Some(timer) => {
-                    ready!(timer.as_mut().poll(cx));
-                    Poll::Ready(Err(DispatchError::SlowRequestTimeout))
-                }
-                None => Poll::Pending,
-            },
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use static_assertions::assert_impl_all;
-
-    use super::*;
-
-    assert_impl_all!(Payload: Unpin, Send, Sync);
-}

actix-http/src/h2/service.rs

@@ -1,7 +1,8 @@
 use std::{
+    error::Error as StdError,
     future::Future,
     marker::PhantomData,
-    mem, net,
+    net,
     pin::Pin,
     rc::Rc,
     task::{Context, Poll},
@@ -10,21 +11,25 @@ use std::{
 use actix_codec::{AsyncRead, AsyncWrite};
 use actix_rt::net::TcpStream;
 use actix_service::{
-    fn_factory, fn_service, IntoServiceFactory, Service, ServiceFactory, ServiceFactoryExt as _,
+    fn_factory, fn_service, IntoServiceFactory, Service, ServiceFactory,
+    ServiceFactoryExt as _,
 };
 use actix_utils::future::ready;
+use bytes::Bytes;
 use futures_core::{future::LocalBoxFuture, ready};
-use tracing::{error, trace};
+use h2::server::{handshake as h2_handshake, Handshake as H2Handshake};
+use log::error;
 
-use super::{dispatcher::Dispatcher, handshake_with_timeout, HandshakeWithTimeout};
 use crate::{
-    body::{BoxBody, MessageBody},
+    body::{AnyBody, MessageBody},
     config::ServiceConfig,
     error::DispatchError,
     service::HttpFlow,
     ConnectCallback, OnConnectData, Request, Response,
 };
 
+use super::dispatcher::Dispatcher;
+
 /// `ServiceFactory` implementation for HTTP/2 transport
 pub struct H2Service<T, S, B> {
     srv: S,
@@ -36,11 +41,12 @@ pub struct H2Service<T, S, B> {
 impl<T, S, B> H2Service<T, S, B>
 where
     S: ServiceFactory<Request, Config = ()>,
-    S::Error: Into<Response<BoxBody>> + 'static,
+    S::Error: Into<Response<AnyBody>> + 'static,
     S::Response: Into<Response<B>> + 'static,
     <S::Service as Service<Request>>::Future: 'static,
 
     B: MessageBody + 'static,
+    B::Error: Into<Box<dyn StdError>>,
 {
     /// Create new `H2Service` instance with config.
     pub(crate) fn with_config<F: IntoServiceFactory<S, Request>>(
@@ -66,11 +72,12 @@ impl<S, B> H2Service<TcpStream, S, B>
 where
     S: ServiceFactory<Request, Config = ()>,
     S::Future: 'static,
-    S::Error: Into<Response<BoxBody>> + 'static,
+    S::Error: Into<Response<AnyBody>> + 'static,
     S::Response: Into<Response<B>> + 'static,
     <S::Service as Service<Request>>::Future: 'static,
 
     B: MessageBody + 'static,
+    B::Error: Into<Box<dyn StdError>>,
 {
     /// Create plain TCP based service
     pub fn tcp(
@@ -109,11 +116,12 @@ mod openssl {
     where
         S: ServiceFactory<Request, Config = ()>,
         S::Future: 'static,
-        S::Error: Into<Response<BoxBody>> + 'static,
+        S::Error: Into<Response<AnyBody>> + 'static,
         S::Response: Into<Response<B>> + 'static,
         <S::Service as Service<Request>>::Future: 'static,
 
         B: MessageBody + 'static,
+        B::Error: Into<Box<dyn StdError>>,
     {
         /// Create OpenSSL based service.
         pub fn openssl(
@@ -140,8 +148,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 _;
@@ -156,13 +164,14 @@ mod rustls_0_20 {
     where
         S: ServiceFactory<Request, Config = ()>,
         S::Future: 'static,
-        S::Error: Into<Response<BoxBody>> + 'static,
+        S::Error: Into<Response<AnyBody>> + 'static,
         S::Response: Into<Response<B>> + 'static,
         <S::Service as Service<Request>>::Future: 'static,
 
         B: MessageBody + 'static,
+        B::Error: Into<Box<dyn StdError>>,
     {
-        /// Create Rustls v0.20 based service.
+        /// Create Rustls based service.
         pub fn rustls(
             self,
             mut config: ServerConfig,
@@ -191,170 +200,18 @@ 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,
 
     S: ServiceFactory<Request, Config = ()>,
     S::Future: 'static,
-    S::Error: Into<Response<BoxBody>> + 'static,
+    S::Error: Into<Response<AnyBody>> + 'static,
     S::Response: Into<Response<B>> + 'static,
     <S::Service as Service<Request>>::Future: 'static,
 
     B: MessageBody + 'static,
+    B::Error: Into<Box<dyn StdError>>,
 {
     type Response = ();
     type Error = DispatchError;
@@ -389,7 +246,7 @@ where
 impl<T, S, B> H2ServiceHandler<T, S, B>
 where
     S: Service<Request>,
-    S::Error: Into<Response<BoxBody>> + 'static,
+    S::Error: Into<Response<AnyBody>> + 'static,
     S::Future: 'static,
     S::Response: Into<Response<B>> + 'static,
     B: MessageBody + 'static,
@@ -412,33 +269,35 @@ impl<T, S, B> Service<(T, Option<net::SocketAddr>)> for H2ServiceHandler<T, S, B
 where
     T: AsyncRead + AsyncWrite + Unpin,
     S: Service<Request>,
-    S::Error: Into<Response<BoxBody>> + 'static,
+    S::Error: Into<Response<AnyBody>> + 'static,
     S::Future: 'static,
     S::Response: Into<Response<B>> + 'static,
     B: MessageBody + 'static,
+    B::Error: Into<Box<dyn StdError>>,
 {
     type Response = ();
     type Error = DispatchError;
     type Future = H2ServiceHandlerResponse<T, S, B>;
 
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.flow.service.poll_ready(cx).map_err(|err| {
+        self.flow.service.poll_ready(cx).map_err(|e| {
-            let err = err.into();
+            let e = e.into();
-            error!("Service readiness error: {:?}", err);
+            error!("Service readiness error: {:?}", e);
-            DispatchError::Service(err)
+            DispatchError::Service(e)
         })
     }
 
     fn call(&self, (io, addr): (T, Option<net::SocketAddr>)) -> Self::Future {
-        let on_connect_data = OnConnectData::from_io(&io, self.on_connect_ext.as_deref());
+        let on_connect_data =
+            OnConnectData::from_io(&io, self.on_connect_ext.as_deref());
 
         H2ServiceHandlerResponse {
             state: State::Handshake(
-                Some(Rc::clone(&self.flow)),
+                Some(self.flow.clone()),
                 Some(self.cfg.clone()),
                 addr,
                 on_connect_data,
-                handshake_with_timeout(io, &self.cfg),
+                h2_handshake(io),
             ),
         }
     }
@@ -449,21 +308,21 @@ where
     T: AsyncRead + AsyncWrite + Unpin,
     S::Future: 'static,
 {
+    Incoming(Dispatcher<T, S, B, (), ()>),
     Handshake(
         Option<Rc<HttpFlow<S, (), ()>>>,
         Option<ServiceConfig>,
         Option<net::SocketAddr>,
         OnConnectData,
-        HandshakeWithTimeout<T>,
+        H2Handshake<T, Bytes>,
     ),
-    Established(Dispatcher<T, S, B, (), ()>),
 }
 
 pub struct H2ServiceHandlerResponse<T, S, B>
 where
     T: AsyncRead + AsyncWrite + Unpin,
     S: Service<Request>,
-    S::Error: Into<Response<BoxBody>> + 'static,
+    S::Error: Into<Response<AnyBody>> + 'static,
     S::Future: 'static,
     S::Response: Into<Response<B>> + 'static,
     B: MessageBody + 'static,
@@ -475,44 +334,40 @@ impl<T, S, B> Future for H2ServiceHandlerResponse<T, S, B>
 where
     T: AsyncRead + AsyncWrite + Unpin,
     S: Service<Request>,
-    S::Error: Into<Response<BoxBody>> + 'static,
+    S::Error: Into<Response<AnyBody>> + 'static,
     S::Future: 'static,
     S::Response: Into<Response<B>> + 'static,
     B: MessageBody,
+    B::Error: Into<Box<dyn StdError>>,
 {
     type Output = Result<(), DispatchError>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         match self.state {
+            State::Incoming(ref mut disp) => Pin::new(disp).poll(cx),
             State::Handshake(
                 ref mut srv,
                 ref mut config,
                 ref peer_addr,
-                ref mut conn_data,
+                ref mut on_connect_data,
                 ref mut handshake,
             ) => match ready!(Pin::new(handshake).poll(cx)) {
-                Ok((conn, timer)) => {
+                Ok(conn) => {
-                    let on_connect_data = mem::take(conn_data);
+                    let on_connect_data = std::mem::take(on_connect_data);
-
+                    self.state = State::Incoming(Dispatcher::new(
-                    self.state = State::Established(Dispatcher::new(
-                        conn,
                         srv.take().unwrap(),
+                        conn,
+                        on_connect_data,
                         config.take().unwrap(),
                         *peer_addr,
-                        on_connect_data,
-                        timer,
                     ));
-
                     self.poll(cx)
                 }
-
                 Err(err) => {
                     trace!("H2 handshake error: {}", err);
-                    Poll::Ready(Err(err))
+                    Poll::Ready(Err(err.into()))
                 }
             },
-
-            State::Established(ref mut disp) => Pin::new(disp).poll(cx),
         }
     }
 }

actix-http/src/header/as_name.rs

@@ -6,7 +6,7 @@ use http::header::{HeaderName, InvalidHeaderName};
 
 /// Sealed trait implemented for types that can be effectively borrowed as a [`HeaderValue`].
 ///
-/// [`HeaderValue`]: super::HeaderValue
+/// [`HeaderValue`]: crate::http::HeaderValue
 pub trait AsHeaderName: Sealed {}
 
 pub struct Seal;
@@ -16,7 +16,6 @@ pub trait Sealed {
 }
 
 impl Sealed for HeaderName {
-    #[inline]
     fn try_as_name(&self, _: Seal) -> Result<Cow<'_, HeaderName>, InvalidHeaderName> {
         Ok(Cow::Borrowed(self))
     }
@@ -24,7 +23,6 @@ impl Sealed for HeaderName {
 impl AsHeaderName for HeaderName {}
 
 impl Sealed for &HeaderName {
-    #[inline]
     fn try_as_name(&self, _: Seal) -> Result<Cow<'_, HeaderName>, InvalidHeaderName> {
         Ok(Cow::Borrowed(*self))
     }
@@ -32,7 +30,6 @@ impl Sealed for &HeaderName {
 impl AsHeaderName for &HeaderName {}
 
 impl Sealed for &str {
-    #[inline]
     fn try_as_name(&self, _: Seal) -> Result<Cow<'_, HeaderName>, InvalidHeaderName> {
         HeaderName::from_str(self).map(Cow::Owned)
     }
@@ -40,7 +37,6 @@ impl Sealed for &str {
 impl AsHeaderName for &str {}
 
 impl Sealed for String {
-    #[inline]
     fn try_as_name(&self, _: Seal) -> Result<Cow<'_, HeaderName>, InvalidHeaderName> {
         HeaderName::from_str(self).map(Cow::Owned)
     }
@@ -48,7 +44,6 @@ impl Sealed for String {
 impl AsHeaderName for String {}
 
 impl Sealed for &String {
-    #[inline]
     fn try_as_name(&self, _: Seal) -> Result<Cow<'_, HeaderName>, InvalidHeaderName> {
         HeaderName::from_str(self).map(Cow::Owned)
     }

actix-http/src/header/common.rs

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