Merge pull request #1541 from JohnTitor/backport-files

files: Bump up to 0.2.2
2025-07-04 18:06:23 +02:00 · 2020-05-27 00:37:29 +09:00 · 2020-05-26 17:22:16 +09:00 · 2020-05-26 17:19:12 +09:00 · 2020-05-26 17:18:47 +09:00 · 2020-05-26 17:14:33 +09:00
171 changed files with 5168 additions and 4050 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,41 +0,0 @@
-environment:
-  global:
-    PROJECT_NAME: actix-web
-  matrix:
-    # Stable channel
-    - TARGET: i686-pc-windows-msvc
-      CHANNEL: stable
-    - TARGET: x86_64-pc-windows-gnu
-      CHANNEL: stable
-    - TARGET: x86_64-pc-windows-msvc
-      CHANNEL: stable
-    # Nightly channel
-    - TARGET: i686-pc-windows-msvc
-      CHANNEL: nightly
-    - TARGET: x86_64-pc-windows-gnu
-      CHANNEL: nightly
-    - TARGET: x86_64-pc-windows-msvc
-      CHANNEL: nightly
-
-# Install Rust and Cargo
-# (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml)
-install:
-  - ps: >-
-        If ($Env:TARGET -eq 'x86_64-pc-windows-gnu') {
-           $Env:PATH += ';C:\msys64\mingw64\bin'
-        } ElseIf ($Env:TARGET -eq 'i686-pc-windows-gnu') {
-           $Env:PATH += ';C:\MinGW\bin'
-        }
-  - curl -sSf -o rustup-init.exe https://win.rustup.rs
-  - rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - rustc -Vv
-  - cargo -V
-
-# 'cargo test' takes care of building for us, so disable Appveyor's build stage.
-build: false
-
-# Equivalent to Travis' `script` phase
-test_script:
-  - cargo clean
-  - cargo test --no-default-features --features="flate2-rust"
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,8 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Gitter channel (actix-web)
-    url: https://gitter.im/actix/actix-web
-    about: Please ask and answer questions about the actix-web here.
-  - name: Gitter channel (actix)
-    url: https://gitter.im/actix/actix
-    about: Please ask and answer questions about the actix here.
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@ -1,23 +0,0 @@
-name: Benchmark (Linux)
-
-on: [push, pull_request]
-
-jobs:
-  check_benchmark:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          profile: minimal
-          override: true
-
-      - name: Check benchmark
-        uses: actions-rs/cargo@v1
-        with:
-          command: bench
-          args: --bench=server -- --sample-size=15
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -8,7 +8,7 @@ jobs:
      fail-fast: false
      matrix:
        version:
-          - 1.40.0 # MSRV
+          - 1.39.0 # MSRV
          - stable
          - nightly

@ -51,14 +51,3 @@ jobs:
        with:
          command: test
          args: --package=awc --no-default-features --features=rustls -- --nocapture
-
-      - name: Generate coverage file
-        if: matrix.version == 'stable' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
-        run: |
-          cargo install cargo-tarpaulin
-          cargo tarpaulin --out Xml
-      - name: Upload to Codecov
-        if: matrix.version == 'stable' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
-        uses: codecov/codecov-action@v1
-        with:
-          file: cobertura.xml
--- a/.github/workflows/upload-doc.yml
+++ b/.github/workflows/upload-doc.yml
@ -1,35 +0,0 @@
-name: Upload documentation
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    if: github.repository == 'actix/actix-web'
-
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable-x86_64-unknown-linux-gnu
-          profile: minimal
-          override: true
-
-      - name: check build
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --no-deps --workspace --all-features
-
-      - name: Tweak HTML
-        run: echo "<meta http-equiv=refresh content=0;url=os_balloon/index.html>" > target/doc/index.html
-
-      - name: Upload documentation
-        run: |
-          git clone https://github.com/davisp/ghp-import.git
-          ./ghp-import/ghp_import.py -n -p -f -m "Documentation upload" -r https://${{ secrets.GITHUB_TOKEN }}@github.com/"${{ github.repository }}.git" target/doc
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -35,7 +35,6 @@ jobs:
          Copy-Item C:\vcpkg\installed\x64-windows\bin\libssl-1_1-x64.dll C:\vcpkg\installed\x64-windows\bin\libssl.dll
          Get-ChildItem C:\vcpkg\installed\x64-windows\bin
          Get-ChildItem C:\vcpkg\installed\x64-windows\lib
-
      - name: check build
        uses: actions-rs/cargo@v1
        with:
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,55 +1,10 @@
 # Changes

-## [3.0.0-alpha.3] - 2020-05-21
-
-### Added
-
-* Add option to create `Data<T>` from `Arc<T>` [#1509]
+## [2.0.NEXT] - 2020-01-xx

 ### 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
+*  Use `sha-1` crate instead of unmaintained `sha1` crate

 ## [2.0.0] - 2019-12-25

--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "3.0.0-alpha.3"
+version = "2.0.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
 readme = "README.md"
@ -30,8 +30,11 @@ members = [
  ".",
  "awc",
  "actix-http",
+  "actix-cors",
  "actix-files",
  "actix-framed",
+  "actix-session",
+  "actix-identity",
  "actix-multipart",
  "actix-web-actors",
  "actix-web-codegen",
@ -39,7 +42,7 @@ members = [
 ]

 [features]
-default = ["compress"]
+default = ["compress", "failure"]

 # content-encoding support
 compress = ["actix-http/compress", "awc/compress"]
@ -47,24 +50,14 @@ compress = ["actix-http/compress", "awc/compress"]
 # sessions feature, session require "ring" crate and c compiler
 secure-cookies = ["actix-http/secure-cookies"]

+failure = ["actix-http/failure"]
+
 # openssl
 openssl = ["actix-tls/openssl", "awc/openssl", "open-ssl"]

 # rustls
 rustls = ["actix-tls/rustls", "awc/rustls", "rust-tls"]

-[[example]]
-name = "basic"
-required-features = ["compress"]
-
-[[example]]
-name = "uds"
-required-features = ["compress"]
-
-[[test]]
-name = "test_server"
-required-features = ["compress"]
-
 [dependencies]
 actix-codec = "0.2.0"
 actix-service = "1.0.2"
@ -75,41 +68,37 @@ actix-server = "1.0.0"
 actix-testing = "1.0.0"
 actix-macros = "0.1.0"
 actix-threadpool = "0.3.1"
-actix-tls = "2.0.0-alpha.1"
+actix-tls = "1.0.0"

-actix-web-codegen = "0.2.2"
-actix-http = "2.0.0-alpha.4"
-awc = { version = "2.0.0-alpha.2", default-features = false }
+actix-web-codegen = "0.2.0"
+actix-http = "1.0.1"
+awc = { version = "1.0.1", default-features = false }

 bytes = "0.5.3"
 derive_more = "0.99.2"
 encoding_rs = "0.8"
-futures-channel = { version = "0.3.5", default-features = false }
-futures-core = { version = "0.3.5", default-features = false }
-futures-util = { version = "0.3.5", default-features = false }
+futures = "0.3.1"
 fxhash = "0.2.1"
 log = "0.4"
 mime = "0.3"
-socket2 = "0.3"
+net2 = "0.2.33"
 pin-project = "0.4.6"
 regex = "1.3"
 serde = { version = "1.0", features=["derive"] }
 serde_json = "1.0"
 serde_urlencoded = "0.6.1"
-time = { version = "0.2.7", default-features = false, features = ["std"] }
+time = "0.1.42"
 url = "2.1"
 open-ssl = { version="0.10", package = "openssl", optional = true }
-rust-tls = { version = "0.17.0", package = "rustls", optional = true }
-tinyvec = { version = "0.3", features = ["alloc"] }
+rust-tls = { version = "0.16.0", package = "rustls", optional = true }

 [dev-dependencies]
-actix = "0.10.0-alpha.1"
+actix = "0.9.0"
 rand = "0.7"
-env_logger = "0.7"
+env_logger = "0.6"
 serde_derive = "1.0"
 brotli2 = "0.3.2"
 flate2 = "1.0.13"
-criterion = "0.3"

 [profile.release]
 lto = true
@ -121,14 +110,9 @@ actix-web = { path = "." }
 actix-http = { path = "actix-http" }
 actix-http-test = { path = "test-server" }
 actix-web-codegen = { path = "actix-web-codegen" }
+actix-cors = { path = "actix-cors" }
+actix-identity = { path = "actix-identity" }
+actix-session = { path = "actix-session" }
 actix-files = { path = "actix-files" }
 actix-multipart = { path = "actix-multipart" }
 awc = { path = "awc" }
-
-[[bench]]
-name = "server"
-harness = false
-
-[[bench]]
-name = "service"
-harness = false
--- a/MIGRATION.md
+++ b/MIGRATION.md
@ -1,17 +1,3 @@
-## Unreleased
-
-* 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`.
-
 ## 2.0.0

 * `HttpServer::start()` renamed to `HttpServer::run()`. It also possible to
@ -366,7 +352,7 @@

 * `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.
+* StaticFiles and NamedFile has been move to separate create.

  instead of `use actix_web::fs::StaticFile`

@ -376,7 +362,7 @@

  use `use actix_files::NamedFile`

-* Multipart has been moved to a separate crate.
+* Multipart has been move to separate create.

  instead of `use actix_web::multipart::Multipart`

--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@
 [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Documentation](https://docs.rs/actix-web/badge.svg)](https://docs.rs/actix-web)
 [![Download](https://img.shields.io/crates/d/actix-web.svg)](https://crates.io/crates/actix-web)
-[![Version](https://img.shields.io/badge/rustc-1.40+-lightgray.svg)](https://blog.rust-lang.org/2019/12/19/Rust-1.40.0.html)
+[![Version](https://img.shields.io/badge/rustc-1.39+-lightgray.svg)](https://blog.rust-lang.org/2019/11/07/Rust-1.39.0.html)
 ![License](https://img.shields.io/crates/l/actix-web.svg)

  </p>
@ -38,13 +38,6 @@ Actix web is a simple, pragmatic and extremely fast web framework for Rust.
 * Middlewares ([Logger, Session, CORS, etc](https://actix.rs/docs/middleware/))
 * Includes an asynchronous [HTTP client](https://actix.rs/actix-web/actix_web/client/index.html)
 * Supports [Actix actor framework](https://github.com/actix/actix)
-* Supports Rust 1.40+
-
-## Docs
-
-* [API documentation (master)](https://actix.rs/actix-web/actix_web)
-* [API documentation (docs.rs)](https://docs.rs/actix-web)
-* [User guide](https://actix.rs)

 ## Example

@ -81,7 +74,7 @@ async fn main() -> std::io::Result<()> {
 * [Stateful](https://github.com/actix/examples/tree/master/state/)
 * [Multipart streams](https://github.com/actix/examples/tree/master/multipart/)
 * [Simple websocket](https://github.com/actix/examples/tree/master/websocket/)
-* [Tera](https://github.com/actix/examples/tree/master/template_tera/)
+* [Tera](https://github.com/actix/examples/tree/master/template_tera/) /
 * [Askama](https://github.com/actix/examples/tree/master/template_askama/) templates
 * [Diesel integration](https://github.com/actix/examples/tree/master/diesel/)
 * [r2d2](https://github.com/actix/examples/tree/master/r2d2/)
--- a/actix-cors/CHANGES.md
+++ b/actix-cors/CHANGES.md
@ -0,0 +1,15 @@
+# Changes
+
+## [0.2.0] - 2019-12-20
+
+* Release
+
+## [0.2.0-alpha.3] - 2019-12-07
+
+* Migrate to actix-web 2.0.0
+
+* Bump `derive_more` crate version to 0.99.0
+
+## [0.1.0] - 2019-06-15
+
+* Move cors middleware to separate crate
--- a/actix-cors/Cargo.toml
+++ b/actix-cors/Cargo.toml
@ -0,0 +1,26 @@
+[package]
+name = "actix-cors"
+version = "0.2.0"
+authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
+description = "Cross-origin resource sharing (CORS) for Actix applications."
+readme = "README.md"
+keywords = ["web", "framework"]
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-web.git"
+documentation = "https://docs.rs/actix-cors/"
+license = "MIT/Apache-2.0"
+edition = "2018"
+workspace = ".."
+
+[lib]
+name = "actix_cors"
+path = "src/lib.rs"
+
+[dependencies]
+actix-web = "2.0.0-rc"
+actix-service = "1.0.1"
+derive_more = "0.99.2"
+futures = "0.3.1"
+
+[dev-dependencies]
+actix-rt = "1.0.0"
--- a/actix-cors/LICENSE-APACHE
+++ b/actix-cors/LICENSE-APACHE
@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-cors/LICENSE-MIT
+++ b/actix-cors/LICENSE-MIT
@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-cors/README.md
+++ b/actix-cors/README.md
@ -1,7 +1,5 @@
 # Cors Middleware for actix web framework [![Build Status](https://travis-ci.org/actix/actix-web.svg?branch=master)](https://travis-ci.org/actix/actix-web) [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) [![crates.io](https://meritbadge.herokuapp.com/actix-cors)](https://crates.io/crates/actix-cors) [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-**This crate moved to https://github.com/actix/actix-extras.**
-
 ## Documentation & community resources

 * [User Guide](https://actix.rs/docs/)
--- a/actix-cors/src/lib.rs
+++ b/actix-cors/src/lib.rs
--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@ -1,9 +1,12 @@
 # Changes

-## [Unreleased] - 2020-xx-xx
+## [0.2.2] - 2020-05-26

-* Bump minimum supported Rust version to 1.40
-* Support sending Content-Length when Content-Range is specified #1384 
+* Minimize `futures` dependency
+* Support sending Content-Length when Content-Range is specified [#1496]
+* Update `actix-web` to 2.0.0
+
+[#1496]: https://github.com/actix/actix-web/issues/1496

 ## [0.2.1] - 2019-12-22

--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "actix-files"
-version = "0.2.1"
+version = "0.2.2"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Static files support for actix web."
 readme = "README.md"
@ -18,8 +18,8 @@ name = "actix_files"
 path = "src/lib.rs"

 [dependencies]
-actix-web = { version = "3.0.0-alpha.3", default-features = false }
-actix-http = "2.0.0-alpha.4"
+actix-web = { version = "2.0.0", default-features = false }
+actix-http = "1.0.1"
 actix-service = "1.0.1"
 bitflags = "1"
 bytes = "0.5.3"
@ -34,4 +34,4 @@ v_htmlescape = "0.4"

 [dev-dependencies]
 actix-rt = "1.0.0"
-actix-web = { version = "3.0.0-alpha.3", features = ["openssl"] }
+actix-web = { version = "2.0.0", features = ["openssl"] }
--- a/actix-files/README.md
+++ b/actix-files/README.md
@ -6,4 +6,4 @@
 * [API Documentation](https://docs.rs/actix-files/)
 * [Chat on gitter](https://gitter.im/actix/actix)
 * Cargo package: [actix-files](https://crates.io/crates/actix-files)
-* Minimum supported Rust version: 1.40 or later
+* Minimum supported Rust version: 1.33 or later
--- a/actix-framed/Cargo.toml
+++ b/actix-framed/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "actix-framed"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix framed app server"
 readme = "README.md"
@ -23,15 +23,15 @@ actix-codec = "0.2.0"
 actix-service = "1.0.1"
 actix-router = "0.2.1"
 actix-rt = "1.0.0"
-actix-http = "2.0.0-alpha.4"
+actix-http = "1.0.1"

 bytes = "0.5.3"
-futures-util = { version = "0.3.5", default-features = false }
+futures = "0.3.1"
 pin-project = "0.4.6"
 log = "0.4"

 [dev-dependencies]
 actix-server = "1.0.0"
-actix-connect = { version = "2.0.0-alpha.2", features = ["openssl"] }
-actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] }
+actix-connect = { version = "1.0.0", features=["openssl"] }
+actix-http-test = { version = "1.0.0", features=["openssl"] }
 actix-utils = "1.0.3"
--- a/actix-framed/README.md
+++ b/actix-framed/README.md
@ -1,8 +1,10 @@
 # Framed app for actix web [![Build Status](https://travis-ci.org/actix/actix-web.svg?branch=master)](https://travis-ci.org/actix/actix-web) [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) [![crates.io](https://meritbadge.herokuapp.com/actix-framed)](https://crates.io/crates/actix-framed) [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

+**Notice**: `actix-framed` is deprecated since we don't use it anymore.
+
 ## Documentation & community resources

 * [API Documentation](https://docs.rs/actix-framed/)
 * [Chat on gitter](https://gitter.im/actix/actix)
 * Cargo package: [actix-framed](https://crates.io/crates/actix-framed)
-* Minimum supported Rust version: 1.40 or later
+* Minimum supported Rust version: 1.33 or later
--- a/actix-framed/changes.md
+++ b/actix-framed/changes.md
@ -1,8 +1,8 @@
 # Changes

-## [Unreleased] - 2020-xx-xx
+## [0.3.1] - 2020-05-25

-* Bump minimum supported Rust version to 1.40
+* Deprecate this crate

 ## [0.3.0] - 2019-12-25

--- a/actix-framed/src/app.rs
+++ b/actix-framed/src/app.rs
@ -8,7 +8,7 @@ use actix_http::h1::{Codec, SendResponse};
 use actix_http::{Error, Request, Response};
 use actix_router::{Path, Router, Url};
 use actix_service::{IntoServiceFactory, Service, ServiceFactory};
-use futures_util::future::{ok, FutureExt, LocalBoxFuture};
+use futures::future::{ok, FutureExt, LocalBoxFuture};

 use crate::helpers::{BoxedHttpNewService, BoxedHttpService, HttpNewService};
 use crate::request::FramedRequest;
--- a/actix-framed/src/helpers.rs
+++ b/actix-framed/src/helpers.rs
@ -2,7 +2,7 @@ use std::task::{Context, Poll};

 use actix_http::Error;
 use actix_service::{Service, ServiceFactory};
-use futures_util::future::{FutureExt, LocalBoxFuture};
+use futures::future::{FutureExt, LocalBoxFuture};

 pub(crate) type BoxedHttpService<Req> = Box<
    dyn Service<
--- a/actix-framed/src/lib.rs
+++ b/actix-framed/src/lib.rs
@ -7,7 +7,7 @@ mod service;
 mod state;
 pub mod test;

-// re-export for convenience
+// re-export for convinience
 pub use actix_http::{http, Error, HttpMessage, Response, ResponseError};

 pub use self::app::{FramedApp, FramedAppService};
--- a/actix-framed/src/request.rs
+++ b/actix-framed/src/request.rs
@ -42,7 +42,7 @@ impl<Io, S> FramedRequest<Io, S> {
        self.req.head()
    }

-    /// This method returns mutable reference to the request head.
+    /// This method returns muttable reference to the request head.
    /// panics if multiple references of http request exists.
    #[inline]
    pub fn head_mut(&mut self) -> &mut RequestHead {
@ -131,7 +131,7 @@ mod tests {
    use super::*;

    #[test]
-    fn test_request() {
+    fn test_reqest() {
        let buf = TestBuffer::empty();
        let framed = Framed::new(buf, Codec::default());
        let req = TestRequest::with_uri("/index.html?q=1")
--- a/actix-framed/src/route.rs
+++ b/actix-framed/src/route.rs
@ -6,7 +6,7 @@ use std::task::{Context, Poll};
 use actix_codec::{AsyncRead, AsyncWrite};
 use actix_http::{http::Method, Error};
 use actix_service::{Service, ServiceFactory};
-use futures_util::future::{ok, FutureExt, LocalBoxFuture, Ready};
+use futures::future::{ok, FutureExt, LocalBoxFuture, Ready};
 use log::error;

 use crate::app::HttpServiceFactory;
--- a/actix-framed/src/service.rs
+++ b/actix-framed/src/service.rs
@ -1,4 +1,3 @@
-use std::future::Future;
 use std::marker::PhantomData;
 use std::pin::Pin;
 use std::task::{Context, Poll};
@ -10,7 +9,8 @@ use actix_http::h1::{Codec, Message};
 use actix_http::ws::{verify_handshake, HandshakeError};
 use actix_http::{Request, Response};
 use actix_service::{Service, ServiceFactory};
-use futures_util::future::{err, ok, Either, Ready};
+use futures::future::{err, ok, Either, Ready};
+use futures::Future;

 /// Service that verifies incoming request if it is valid websocket
 /// upgrade request. In case of error returns `HandshakeError`
--- a/actix-framed/tests/test_server.rs
+++ b/actix-framed/tests/test_server.rs
@ -4,7 +4,7 @@ use actix_http_test::test_server;
 use actix_service::{pipeline_factory, IntoServiceFactory, ServiceFactory};
 use actix_utils::framed::Dispatcher;
 use bytes::Bytes;
-use futures_util::{future, SinkExt, StreamExt};
+use futures::{future, SinkExt, StreamExt};

 use actix_framed::{FramedApp, FramedRequest, FramedRoute, SendError, VerifyWebSockets};

@ -47,8 +47,7 @@ async fn test_simple() {
            )
            .finish(|_| future::ok::<_, Error>(Response::NotFound()))
            .tcp()
-    })
-    .await;
+    });

    assert!(srv.ws_at("/test").await.is_err());

@ -109,8 +108,7 @@ async fn test_service() {
                    .map_err(|_| ()),
            ),
        )
-    })
-    .await;
+    });

    // non ws request
    let res = srv.get("/index.html").send().await.unwrap();
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@ -1,68 +1,5 @@
 # Changes

-## [2.0.0-alpha.4] - 2020-05-21
-
-### Changed
-
-* Bump minimum supported Rust version to 1.40
-* content_length function is removed, and you can set Content-Length by calling no_chunking function [#1439]
-* `BodySize::Sized64` variant has been removed. `BodySize::Sized` now receives a
-  `u64` instead of a `usize`.
-* Update `base64` dependency to 0.12
-
-### Fixed
-
-* Support parsing of `SameSite=None` [#1503]
-
-[#1439]: https://github.com/actix/actix-web/pull/1439
-[#1503]: https://github.com/actix/actix-web/pull/1503
-
-## [2.0.0-alpha.3] - 2020-05-08
-
-### Fixed
-
-* Correct spelling of ConnectError::Unresolved [#1487]
-* Fix a mistake in the encoding of websocket continuation messages wherein
-  Item::FirstText and Item::FirstBinary are each encoded as the other.
-
-### Changed
-
-* Implement `std::error::Error` for our custom errors [#1422]
-* Remove `failure` support for `ResponseError` since that crate
-  will be deprecated in the near future.
-
-[#1422]: https://github.com/actix/actix-web/pull/1422
-[#1487]: https://github.com/actix/actix-web/pull/1487
-
-## [2.0.0-alpha.2] - 2020-03-07
-
-### Changed
-
-* Update `actix-connect` and `actix-tls` dependency to 2.0.0-alpha.1. [#1395]
-
-* Change default initial window size and connection window size for HTTP2 to 2MB and 1MB respectively
-  to improve download speed for awc when downloading large objects. [#1394]
-
-* client::Connector accepts initial_window_size and initial_connection_window_size HTTP2 configuration. [#1394]
-
-* client::Connector allowing to set max_http_version to limit HTTP version to be used. [#1394]
-
-[#1394]: https://github.com/actix/actix-web/pull/1394
-[#1395]: https://github.com/actix/actix-web/pull/1395
-
-## [2.0.0-alpha.1] - 2020-02-27
-
-### Changed
-
-* Update the `time` dependency to 0.2.7.
-* Moved actors messages support from actix crate, enabled with feature `actors`.
-* Breaking change: trait MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next().
-* MessageBody is not implemented for &'static [u8] anymore.
-
-### Fixed
-
-* Allow `SameSite=None` cookies to be sent in a response.
-
 ## [1.0.1] - 2019-12-20

 ### Fixed
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "2.0.0-alpha.4"
+version = "1.0.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix http primitives"
 readme = "README.md"
@ -15,7 +15,7 @@ license = "MIT/Apache-2.0"
 edition = "2018"

 [package.metadata.docs.rs]
-features = ["openssl", "rustls", "compress", "secure-cookies", "actors"]
+features = ["openssl", "rustls", "failure", "compress", "secure-cookies"]

 [lib]
 name = "actix_http"
@ -33,38 +33,37 @@ rustls = ["actix-tls/rustls", "actix-connect/rustls"]
 # enable compressison support
 compress = ["flate2", "brotli2"]

+# failure integration. actix does not use failure anymore
+failure = ["fail-ure"]
+
 # support for secure cookies
 secure-cookies = ["ring"]

-# support for actix Actor messages
-actors = ["actix"]
-
 [dependencies]
-actix-service = "1.0.5"
+actix-service = "1.0.1"
 actix-codec = "0.2.0"
-actix-connect = "2.0.0-alpha.3"
-actix-utils = "1.0.6"
+actix-connect = "1.0.1"
+actix-utils = "1.0.3"
 actix-rt = "1.0.0"
 actix-threadpool = "0.3.1"
-actix-tls = { version = "2.0.0-alpha.1", optional = true }
-actix = { version = "0.10.0-alpha.1", optional = true }
+actix-tls = { version = "1.0.0", optional = true }

-base64 = "0.12"
+base64 = "0.11"
 bitflags = "1.2"
 bytes = "0.5.3"
 copyless = "0.1.4"
+chrono = "0.4.6"
 derive_more = "0.99.2"
 either = "1.5.3"
 encoding_rs = "0.8"
-futures-channel = { version = "0.3.5", default-features = false }
-futures-core = { version = "0.3.5", default-features = false }
-futures-util = { version = "0.3.5", default-features = false }
+futures-core = "0.3.1"
+futures-util = "0.3.1"
+futures-channel = "0.3.1"
 fxhash = "0.2.1"
 h2 = "0.2.1"
 http = "0.2.0"
 httparse = "1.3"
 indexmap = "1.3"
-itoa = "0.4"
 lazy_static = "1.4"
 language-tags = "0.2"
 log = "0.4"
@ -78,7 +77,7 @@ serde_json = "1.0"
 sha-1 = "0.8"
 slab = "0.4"
 serde_urlencoded = "0.6.1"
-time = { version = "0.2.7", default-features = false, features = ["std"] }
+time = "0.1.42"

 # for secure cookie
 ring = { version = "0.16.9", optional = true }
@ -87,21 +86,16 @@ ring = { version = "0.16.9", optional = true }
 brotli2 = { version="0.3.2", optional = true }
 flate2 = { version = "1.0.13", optional = true }

+# optional deps
+fail-ure = { version = "0.1.5", package="failure", optional = true }
+
 [dev-dependencies]
-actix-server = "1.0.1"
-actix-connect = { version = "2.0.0-alpha.2", features = ["openssl"] }
-actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] }
-actix-tls = { version = "2.0.0-alpha.1", features = ["openssl"] }
-criterion = "0.3"
-env_logger = "0.7"
+actix-server = "1.0.0"
+actix-connect = { version = "1.0.0", features=["openssl"] }
+actix-http-test = { version = "1.0.0", features=["openssl"] }
+actix-tls = { version = "1.0.0", features=["openssl"] }
+futures = "0.3.1"
+env_logger = "0.6"
 serde_derive = "1.0"
 open-ssl = { version="0.10", package = "openssl" }
-rust-tls = { version="0.17", package = "rustls" }
-
-[[bench]]
-name = "content-length"
-harness = false
-
-[[bench]]
-name = "status-line"
-harness = false
+rust-tls = { version="0.16", package = "rustls" }
--- a/actix-http/README.md
+++ b/actix-http/README.md
@ -8,40 +8,25 @@ Actix http
 * [API Documentation](https://docs.rs/actix-http/)
 * [Chat on gitter](https://gitter.im/actix/actix)
 * Cargo package: [actix-http](https://crates.io/crates/actix-http)
-* Minimum supported Rust version: 1.40 or later
+* Minimum supported Rust version: 1.31 or later

 ## Example

 ```rust
 // see examples/framed_hello.rs for complete list of used crates.
-use std::{env, io};
+extern crate actix_http;
+use actix_http::{h1, Response, ServiceConfig};

-use actix_http::{HttpService, Response};
-use actix_server::Server;
-use futures::future;
-use http::header::HeaderValue;
-use log::info;
-
-#[actix_rt::main]
-async fn main() -> io::Result<()> {
-    env::set_var("RUST_LOG", "hello_world=info");
-    env_logger::init();
-
-    Server::build()
-        .bind("hello-world", "127.0.0.1:8080", || {
-            HttpService::build()
-                .client_timeout(1000)
-                .client_disconnect(1000)
-                .finish(|_req| {
-                    info!("{:?}", _req);
-                    let mut res = Response::Ok();
-                    res.header("x-head", HeaderValue::from_static("dummy value!"));
-                    future::ok::<_, ()>(res.body("Hello world!"))
-                })
-                .tcp()
-        })?
-        .run()
-        .await
+fn main() {
+    Server::new().bind("framed_hello", "127.0.0.1:8080", || {
+        IntoFramed::new(|| h1::Codec::new(ServiceConfig::default()))	// <- create h1 codec
+            .and_then(TakeItem::new().map_err(|_| ()))	                // <- read one request
+            .and_then(|(_req, _framed): (_, Framed<_, _>)| {	        // <- send response and close conn
+                SendResponse::send(_framed, Response::Ok().body("Hello world!"))
+                    .map_err(|_| ())
+                    .map(|_| ())
+            })
+    }).unwrap().run();
 }
 ```

--- a/actix-http/benches/content-length.rs
+++ b/actix-http/benches/content-length.rs
@ -1,291 +0,0 @@
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
-
-use bytes::BytesMut;
-
-// benchmark sending all requests at the same time
-fn bench_write_content_length(c: &mut Criterion) {
-    let mut group = c.benchmark_group("write_content_length");
-
-    let sizes = [
-        0, 1, 11, 83, 101, 653, 1001, 6323, 10001, 56329, 100001, 123456, 98724245,
-        4294967202,
-    ];
-
-    for i in sizes.iter() {
-        group.bench_with_input(BenchmarkId::new("Original (unsafe)", i), i, |b, &i| {
-            b.iter(|| {
-                let mut b = BytesMut::with_capacity(35);
-                _original::write_content_length(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_content_length(i, &mut b)
-            })
-        });
-
-        group.bench_with_input(BenchmarkId::new("itoa", i), i, |b, &i| {
-            b.iter(|| {
-                let mut b = BytesMut::with_capacity(35);
-                _itoa::write_content_length(i, &mut b)
-            })
-        });
-    }
-
-    group.finish();
-}
-
-criterion_group!(benches, bench_write_content_length);
-criterion_main!(benches);
-
-mod _itoa {
-    use bytes::{BufMut, BytesMut};
-
-    pub fn write_content_length(n: usize, bytes: &mut BytesMut) {
-        if n == 0 {
-            bytes.put_slice(b"\r\ncontent-length: 0\r\n");
-            return;
-        }
-
-        let mut buf = itoa::Buffer::new();
-
-        bytes.put_slice(b"\r\ncontent-length: ");
-        bytes.put_slice(buf.format(n).as_bytes());
-        bytes.put_slice(b"\r\n");
-    }
-}
-
-mod _new {
-    use bytes::{BufMut, BytesMut};
-
-    const DIGITS_START: u8 = b'0';
-
-    /// NOTE: bytes object has to contain enough space
-    pub fn write_content_length(n: usize, bytes: &mut BytesMut) {
-        if n == 0 {
-            bytes.put_slice(b"\r\ncontent-length: 0\r\n");
-            return;
-        }
-
-        bytes.put_slice(b"\r\ncontent-length: ");
-
-        if n < 10 {
-            bytes.put_u8(DIGITS_START + (n as u8));
-        } else if n < 100 {
-            let n = n as u8;
-
-            let d10 = n / 10;
-            let d1 = n % 10;
-
-            bytes.put_u8(DIGITS_START + d10);
-            bytes.put_u8(DIGITS_START + d1);
-        } else if n < 1000 {
-            let n = n as u16;
-
-            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);
-        } else if n < 10_000 {
-            let n = n as u16;
-
-            let d1000 = (n / 1000) as u8;
-            let d100 = ((n / 100) % 10) as u8;
-            let d10 = ((n / 10) % 10) as u8;
-            let d1 = (n % 10) as u8;
-
-            bytes.put_u8(DIGITS_START + d1000);
-            bytes.put_u8(DIGITS_START + d100);
-            bytes.put_u8(DIGITS_START + d10);
-            bytes.put_u8(DIGITS_START + d1);
-        } else if n < 100_000 {
-            let n = n as u32;
-
-            let d10000 = (n / 10000) as u8;
-            let d1000 = ((n / 1000) % 10) as u8;
-            let d100 = ((n / 100) % 10) as u8;
-            let d10 = ((n / 10) % 10) as u8;
-            let d1 = (n % 10) as u8;
-
-            bytes.put_u8(DIGITS_START + d10000);
-            bytes.put_u8(DIGITS_START + d1000);
-            bytes.put_u8(DIGITS_START + d100);
-            bytes.put_u8(DIGITS_START + d10);
-            bytes.put_u8(DIGITS_START + d1);
-        } else if n < 1_000_000 {
-            let n = n as u32;
-
-            let d100000 = (n / 100000) as u8;
-            let d10000 = ((n / 10000) % 10) as u8;
-            let d1000 = ((n / 1000) % 10) as u8;
-            let d100 = ((n / 100) % 10) as u8;
-            let d10 = ((n / 10) % 10) as u8;
-            let d1 = (n % 10) as u8;
-
-            bytes.put_u8(DIGITS_START + d100000);
-            bytes.put_u8(DIGITS_START + d10000);
-            bytes.put_u8(DIGITS_START + d1000);
-            bytes.put_u8(DIGITS_START + d100);
-            bytes.put_u8(DIGITS_START + d10);
-            bytes.put_u8(DIGITS_START + d1);
-        } else {
-            write_usize(n, bytes);
-        }
-
-        bytes.put_slice(b"\r\n");
-    }
-
-    fn write_usize(n: usize, bytes: &mut BytesMut) {
-        let mut n = n;
-
-        // 20 chars is max length of a usize (2^64)
-        // digits will be added to the buffer from lsd to msd
-        let mut buf = BytesMut::with_capacity(20);
-
-        while n > 9 {
-            // "pop" the least-significant digit
-            let lsd = (n % 10) as u8;
-
-            // remove the lsd from n
-            n = n / 10;
-
-            buf.put_u8(DIGITS_START + lsd);
-        }
-
-        // put msd to result buffer
-        bytes.put_u8(DIGITS_START + (n as u8));
-
-        // put, in reverse (msd to lsd), remaining digits to buffer
-        for i in (0..buf.len()).rev() {
-            bytes.put_u8(buf[i]);
-        }
-    }
-}
-
-mod _original {
-    use std::{mem, ptr, slice};
-
-    use bytes::{BufMut, BytesMut};
-
-    const DEC_DIGITS_LUT: &[u8] = b"0001020304050607080910111213141516171819\
-          2021222324252627282930313233343536373839\
-          4041424344454647484950515253545556575859\
-          6061626364656667686970717273747576777879\
-          8081828384858687888990919293949596979899";
-
-    /// NOTE: bytes object has to contain enough space
-    pub fn write_content_length(mut n: usize, bytes: &mut BytesMut) {
-        if n < 10 {
-            let mut buf: [u8; 21] = [
-                b'\r', b'\n', b'c', b'o', b'n', b't', b'e', b'n', b't', b'-', b'l',
-                b'e', b'n', b'g', b't', b'h', b':', b' ', b'0', b'\r', b'\n',
-            ];
-            buf[18] = (n as u8) + b'0';
-            bytes.put_slice(&buf);
-        } else if n < 100 {
-            let mut buf: [u8; 22] = [
-                b'\r', b'\n', b'c', b'o', b'n', b't', b'e', b'n', b't', b'-', b'l',
-                b'e', b'n', b'g', b't', b'h', b':', b' ', b'0', b'0', b'\r', b'\n',
-            ];
-            let d1 = n << 1;
-            unsafe {
-                ptr::copy_nonoverlapping(
-                    DEC_DIGITS_LUT.as_ptr().add(d1),
-                    buf.as_mut_ptr().offset(18),
-                    2,
-                );
-            }
-            bytes.put_slice(&buf);
-        } else if n < 1000 {
-            let mut buf: [u8; 23] = [
-                b'\r', b'\n', b'c', b'o', b'n', b't', b'e', b'n', b't', b'-', b'l',
-                b'e', b'n', b'g', b't', b'h', b':', b' ', b'0', b'0', b'0', b'\r',
-                b'\n',
-            ];
-            // decode 2 more chars, if > 2 chars
-            let d1 = (n % 100) << 1;
-            n /= 100;
-            unsafe {
-                ptr::copy_nonoverlapping(
-                    DEC_DIGITS_LUT.as_ptr().add(d1),
-                    buf.as_mut_ptr().offset(19),
-                    2,
-                )
-            };
-
-            // decode last 1
-            buf[18] = (n as u8) + b'0';
-
-            bytes.put_slice(&buf);
-        } else {
-            bytes.put_slice(b"\r\ncontent-length: ");
-            convert_usize(n, bytes);
-        }
-    }
-
-    pub(crate) fn convert_usize(mut n: usize, bytes: &mut BytesMut) {
-        let mut curr: isize = 39;
-        let mut buf: [u8; 41] = unsafe { mem::MaybeUninit::uninit().assume_init() };
-        buf[39] = b'\r';
-        buf[40] = b'\n';
-        let buf_ptr = buf.as_mut_ptr();
-        let lut_ptr = DEC_DIGITS_LUT.as_ptr();
-
-        // eagerly decode 4 characters at a time
-        while n >= 10_000 {
-            let rem = (n % 10_000) as isize;
-            n /= 10_000;
-
-            let d1 = (rem / 100) << 1;
-            let d2 = (rem % 100) << 1;
-            curr -= 4;
-            unsafe {
-                ptr::copy_nonoverlapping(lut_ptr.offset(d1), buf_ptr.offset(curr), 2);
-                ptr::copy_nonoverlapping(
-                    lut_ptr.offset(d2),
-                    buf_ptr.offset(curr + 2),
-                    2,
-                );
-            }
-        }
-
-        // if we reach here numbers are <= 9999, so at most 4 chars long
-        let mut n = n as isize; // possibly reduce 64bit math
-
-        // decode 2 more chars, if > 2 chars
-        if n >= 100 {
-            let d1 = (n % 100) << 1;
-            n /= 100;
-            curr -= 2;
-            unsafe {
-                ptr::copy_nonoverlapping(lut_ptr.offset(d1), 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), buf_ptr.offset(curr), 2);
-            }
-        }
-
-        unsafe {
-            bytes.extend_from_slice(slice::from_raw_parts(
-                buf_ptr.offset(curr),
-                41 - curr as usize,
-            ));
-        }
-    }
-}
--- a/actix-http/benches/status-line.rs
+++ b/actix-http/benches/status-line.rs
@ -1,222 +0,0 @@
-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' ');
-        }
-    }
-}
--- a/actix-http/examples/echo.rs
+++ b/actix-http/examples/echo.rs
@ -3,7 +3,7 @@ use std::{env, io};
 use actix_http::{Error, HttpService, Request, Response};
 use actix_server::Server;
 use bytes::BytesMut;
-use futures_util::StreamExt;
+use futures::StreamExt;
 use http::header::HeaderValue;
 use log::info;

@ -17,18 +17,23 @@ async fn main() -> io::Result<()> {
            HttpService::build()
                .client_timeout(1000)
                .client_disconnect(1000)
-                .finish(|mut req: Request| async move {
-                    let mut body = BytesMut::new();
-                    while let Some(item) = req.payload().next().await {
-                        body.extend_from_slice(&item?);
-                    }
+                .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);
-                    Ok::<_, Error>(
-                        Response::Ok()
-                            .header("x-head", HeaderValue::from_static("dummy value!"))
-                            .body(body),
-                    )
+                        info!("request body: {:?}", body);
+                        Ok::<_, Error>(
+                            Response::Ok()
+                                .header(
+                                    "x-head",
+                                    HeaderValue::from_static("dummy value!"),
+                                )
+                                .body(body),
+                        )
+                    }
                })
                .tcp()
        })?
--- a/actix-http/examples/echo2.rs
+++ b/actix-http/examples/echo2.rs
@ -4,7 +4,7 @@ use actix_http::http::HeaderValue;
 use actix_http::{Error, HttpService, Request, Response};
 use actix_server::Server;
 use bytes::BytesMut;
-use futures_util::StreamExt;
+use futures::StreamExt;
 use log::info;

 async fn handle_request(mut req: Request) -> Result<Response, Error> {
--- a/actix-http/examples/hello-world.rs
+++ b/actix-http/examples/hello-world.rs
@ -2,7 +2,7 @@ use std::{env, io};

 use actix_http::{HttpService, Response};
 use actix_server::Server;
-use futures_util::future;
+use futures::future;
 use http::header::HeaderValue;
 use log::info;

--- a/actix-http/src/body.rs
+++ b/actix-http/src/body.rs
@ -5,7 +5,6 @@ use std::{fmt, mem};

 use bytes::{Bytes, BytesMut};
 use futures_core::Stream;
-use futures_util::ready;
 use pin_project::{pin_project, project};

 use crate::error::Error;
@ -15,7 +14,8 @@ use crate::error::Error;
 pub enum BodySize {
    None,
    Empty,
-    Sized(u64),
+    Sized(usize),
+    Sized64(u64),
    Stream,
 }

@ -24,7 +24,8 @@ impl BodySize {
        match self {
            BodySize::None
            | BodySize::Empty
-            | BodySize::Sized(0) => true,
+            | BodySize::Sized(0)
+            | BodySize::Sized64(0) => true,
            _ => false,
        }
    }
@ -34,46 +35,33 @@ impl BodySize {
 pub trait MessageBody {
    fn size(&self) -> BodySize;

-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>>;
-
-    downcast_get_type_id!();
+    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>>;
 }

-downcast!(MessageBody);
-
 impl MessageBody for () {
    fn size(&self) -> BodySize {
        BodySize::Empty
    }

-    fn poll_next(
-        self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
+    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
        Poll::Ready(None)
    }
 }

-impl<T: MessageBody + Unpin> MessageBody for Box<T> {
+impl<T: MessageBody> MessageBody for Box<T> {
    fn size(&self) -> BodySize {
        self.as_ref().size()
    }

-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
-        Pin::new(self.get_mut().as_mut()).poll_next(cx)
+    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
+        self.as_mut().poll_next(cx)
    }
 }

 #[pin_project]
 pub enum ResponseBody<B> {
-    Body(#[pin] B),
-    Other(#[pin] Body),
+    Body(B),
+    Other(Body),
 }

 impl ResponseBody<Body> {
@ -109,15 +97,10 @@ impl<B: MessageBody> MessageBody for ResponseBody<B> {
        }
    }

-    #[project]
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
-        #[project]
-        match self.project() {
-            ResponseBody::Body(body) => body.poll_next(cx),
-            ResponseBody::Other(body) => body.poll_next(cx),
+    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
+        match self {
+            ResponseBody::Body(ref mut body) => body.poll_next(cx),
+            ResponseBody::Other(ref mut body) => body.poll_next(cx),
        }
    }
 }
@ -132,13 +115,12 @@ impl<B: MessageBody> Stream for ResponseBody<B> {
    ) -> Poll<Option<Self::Item>> {
        #[project]
        match self.project() {
-            ResponseBody::Body(body) => body.poll_next(cx),
-            ResponseBody::Other(body) => body.poll_next(cx),
+            ResponseBody::Body(ref mut body) => body.poll_next(cx),
+            ResponseBody::Other(ref mut body) => body.poll_next(cx),
        }
    }
 }

-#[pin_project]
 /// Represents various types of http message body.
 pub enum Body {
    /// Empty response. `Content-Length` header is not set.
@ -148,7 +130,7 @@ pub enum Body {
    /// Specific response body.
    Bytes(Bytes),
    /// Generic message body.
-    Message(Box<dyn MessageBody + Unpin>),
+    Message(Box<dyn MessageBody>),
 }

 impl Body {
@ -158,7 +140,7 @@ impl Body {
    }

    /// Create body from generic message body.
-    pub fn from_message<B: MessageBody + Unpin + 'static>(body: B) -> Body {
+    pub fn from_message<B: MessageBody + 'static>(body: B) -> Body {
        Body::Message(Box::new(body))
    }
 }
@ -168,18 +150,13 @@ impl MessageBody for Body {
        match self {
            Body::None => BodySize::None,
            Body::Empty => BodySize::Empty,
-            Body::Bytes(ref bin) => BodySize::Sized(bin.len() as u64),
+            Body::Bytes(ref bin) => BodySize::Sized(bin.len()),
            Body::Message(ref body) => body.size(),
        }
    }

-    #[project]
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
-        #[project]
-        match self.project() {
+    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
+        match self {
            Body::None => Poll::Ready(None),
            Body::Empty => Poll::Ready(None),
            Body::Bytes(ref mut bin) => {
@ -187,10 +164,10 @@ impl MessageBody for Body {
                if len == 0 {
                    Poll::Ready(None)
                } else {
-                    Poll::Ready(Some(Ok(mem::take(bin))))
+                    Poll::Ready(Some(Ok(mem::replace(bin, Bytes::new()))))
                }
            }
-            Body::Message(ref mut body) => Pin::new(body.as_mut()).poll_next(cx),
+            Body::Message(ref mut body) => body.poll_next(cx),
        }
    }
 }
@ -276,7 +253,7 @@ impl From<serde_json::Value> for Body {

 impl<S> From<SizedStream<S>> for Body
 where
-    S: Stream<Item = Result<Bytes, Error>> + Unpin + 'static,
+    S: Stream<Item = Result<Bytes, Error>> + 'static,
 {
    fn from(s: SizedStream<S>) -> Body {
        Body::from_message(s)
@ -285,7 +262,7 @@ where

 impl<S, E> From<BodyStream<S, E>> for Body
 where
-    S: Stream<Item = Result<Bytes, E>> + Unpin + 'static,
+    S: Stream<Item = Result<Bytes, E>> + 'static,
    E: Into<Error> + 'static,
 {
    fn from(s: BodyStream<S, E>) -> Body {
@ -295,88 +272,87 @@ where

 impl MessageBody for Bytes {
    fn size(&self) -> BodySize {
-        BodySize::Sized(self.len() as u64)
+        BodySize::Sized(self.len())
    }

-    fn poll_next(
-        self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
+    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
        if self.is_empty() {
            Poll::Ready(None)
        } else {
-            Poll::Ready(Some(Ok(mem::take(self.get_mut()))))
+            Poll::Ready(Some(Ok(mem::replace(self, Bytes::new()))))
        }
    }
 }

 impl MessageBody for BytesMut {
    fn size(&self) -> BodySize {
-        BodySize::Sized(self.len() as u64)
+        BodySize::Sized(self.len())
    }

-    fn poll_next(
-        self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
+    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
        if self.is_empty() {
            Poll::Ready(None)
        } else {
-            Poll::Ready(Some(Ok(mem::take(self.get_mut()).freeze())))
+            Poll::Ready(Some(Ok(mem::replace(self, BytesMut::new()).freeze())))
        }
    }
 }

 impl MessageBody for &'static str {
    fn size(&self) -> BodySize {
-        BodySize::Sized(self.len() as u64)
+        BodySize::Sized(self.len())
    }

-    fn poll_next(
-        self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
+    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
        if self.is_empty() {
            Poll::Ready(None)
        } else {
            Poll::Ready(Some(Ok(Bytes::from_static(
-                mem::take(self.get_mut()).as_ref(),
+                mem::replace(self, "").as_ref(),
            ))))
        }
    }
 }

+impl MessageBody for &'static [u8] {
+    fn size(&self) -> BodySize {
+        BodySize::Sized(self.len())
+    }
+
+    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
+        if self.is_empty() {
+            Poll::Ready(None)
+        } else {
+            Poll::Ready(Some(Ok(Bytes::from_static(mem::replace(self, b"")))))
+        }
+    }
+}
+
 impl MessageBody for Vec<u8> {
    fn size(&self) -> BodySize {
-        BodySize::Sized(self.len() as u64)
+        BodySize::Sized(self.len())
    }

-    fn poll_next(
-        self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
+    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
        if self.is_empty() {
            Poll::Ready(None)
        } else {
-            Poll::Ready(Some(Ok(Bytes::from(mem::take(self.get_mut())))))
+            Poll::Ready(Some(Ok(Bytes::from(mem::replace(self, Vec::new())))))
        }
    }
 }

 impl MessageBody for String {
    fn size(&self) -> BodySize {
-        BodySize::Sized(self.len() as u64)
+        BodySize::Sized(self.len())
    }

-    fn poll_next(
-        self: Pin<&mut Self>,
-        _: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
+    fn poll_next(&mut self, _: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
        if self.is_empty() {
            Poll::Ready(None)
        } else {
            Poll::Ready(Some(Ok(Bytes::from(
-                mem::take(self.get_mut()).into_bytes(),
+                mem::replace(self, String::new()).into_bytes(),
            ))))
        }
    }
@ -385,7 +361,7 @@ impl MessageBody for String {
 /// Type represent streaming body.
 /// Response does not contain `content-length` header and appropriate transfer encoding is used.
 #[pin_project]
-pub struct BodyStream<S: Unpin, E> {
+pub struct BodyStream<S, E> {
    #[pin]
    stream: S,
    _t: PhantomData<E>,
@ -393,7 +369,7 @@ pub struct BodyStream<S: Unpin, E> {

 impl<S, E> BodyStream<S, E>
 where
-    S: Stream<Item = Result<Bytes, E>> + Unpin,
+    S: Stream<Item = Result<Bytes, E>>,
    E: Into<Error>,
 {
    pub fn new(stream: S) -> Self {
@ -406,37 +382,26 @@ where

 impl<S, E> MessageBody for BodyStream<S, E>
 where
-    S: Stream<Item = Result<Bytes, E>> + Unpin,
+    S: Stream<Item = Result<Bytes, E>>,
    E: Into<Error>,
 {
    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 zero-length chunk, but rather proceed until the underlying
-    /// [`Stream`] ends.
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
-        let mut stream = self.project().stream;
-        loop {
-            let stream = stream.as_mut();
-            return Poll::Ready(match ready!(stream.poll_next(cx)) {
-                Some(Ok(ref bytes)) if bytes.is_empty() => continue,
-                opt => opt.map(|res| res.map_err(Into::into)),
-            });
-        }
+    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
+        unsafe { Pin::new_unchecked(self) }
+            .project()
+            .stream
+            .poll_next(cx)
+            .map(|res| res.map(|res| res.map_err(std::convert::Into::into)))
    }
 }

 /// Type represent streaming body. This body implementation should be used
 /// if total size of stream is known. Data get sent as is without using transfer encoding.
 #[pin_project]
-pub struct SizedStream<S: Unpin> {
+pub struct SizedStream<S> {
    size: u64,
    #[pin]
    stream: S,
@ -444,7 +409,7 @@ pub struct SizedStream<S: Unpin> {

 impl<S> SizedStream<S>
 where
-    S: Stream<Item = Result<Bytes, Error>> + Unpin,
+    S: Stream<Item = Result<Bytes, Error>>,
 {
    pub fn new(size: u64, stream: S) -> Self {
        SizedStream { size, stream }
@ -453,38 +418,24 @@ where

 impl<S> MessageBody for SizedStream<S>
 where
-    S: Stream<Item = Result<Bytes, Error>> + Unpin,
+    S: Stream<Item = Result<Bytes, Error>>,
 {
    fn size(&self) -> BodySize {
-        BodySize::Sized(self.size as u64)
+        BodySize::Sized64(self.size)
    }

-    /// Attempts to pull out the next value of the underlying [`Stream`].
-    ///
-    /// Empty values are skipped to prevent [`SizedStream`]'s transmission being
-    /// ended on a zero-length chunk, but rather proceed until the underlying
-    /// [`Stream`] ends.
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
-        let mut stream: Pin<&mut S> = self.project().stream;
-        loop {
-            let stream = stream.as_mut();
-            return Poll::Ready(match ready!(stream.poll_next(cx)) {
-                Some(Ok(ref bytes)) if bytes.is_empty() => continue,
-                val => val,
-            });
-        }
+    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
+        unsafe { Pin::new_unchecked(self) }
+            .project()
+            .stream
+            .poll_next(cx)
    }
 }

 #[cfg(test)]
 mod tests {
    use super::*;
-    use futures_util::stream;
    use futures_util::future::poll_fn;
-    use futures_util::pin_mut;

    impl Body {
        pub(crate) fn get_ref(&self) -> &[u8] {
@ -512,10 +463,7 @@ mod tests {

        assert_eq!("test".size(), BodySize::Sized(4));
        assert_eq!(
-            poll_fn(|cx| Pin::new(&mut "test").poll_next(cx))
-                .await
-                .unwrap()
-                .ok(),
+            poll_fn(|cx| "test".poll_next(cx)).await.unwrap().ok(),
            Some(Bytes::from("test"))
        );
    }
@ -529,12 +477,13 @@ mod tests {
            BodySize::Sized(4)
        );
        assert_eq!(Body::from_slice(b"test".as_ref()).get_ref(), b"test");
-        let sb = Bytes::from(&b"test"[..]);
-        pin_mut!(sb);

-        assert_eq!(sb.size(), BodySize::Sized(4));
+        assert_eq!((&b"test"[..]).size(), BodySize::Sized(4));
        assert_eq!(
-            poll_fn(|cx| sb.as_mut().poll_next(cx)).await.unwrap().ok(),
+            poll_fn(|cx| (&b"test"[..]).poll_next(cx))
+                .await
+                .unwrap()
+                .ok(),
            Some(Bytes::from("test"))
        );
    }
@ -543,12 +492,10 @@ mod tests {
    async fn test_vec() {
        assert_eq!(Body::from(Vec::from("test")).size(), BodySize::Sized(4));
        assert_eq!(Body::from(Vec::from("test")).get_ref(), b"test");
-        let test_vec = Vec::from("test");
-        pin_mut!(test_vec);

-        assert_eq!(test_vec.size(), BodySize::Sized(4));
+        assert_eq!(Vec::from("test").size(), BodySize::Sized(4));
        assert_eq!(
-            poll_fn(|cx| test_vec.as_mut().poll_next(cx))
+            poll_fn(|cx| Vec::from("test").poll_next(cx))
                .await
                .unwrap()
                .ok(),
@ -558,44 +505,41 @@ mod tests {

    #[actix_rt::test]
    async fn test_bytes() {
-        let b = Bytes::from("test");
+        let mut b = Bytes::from("test");
        assert_eq!(Body::from(b.clone()).size(), BodySize::Sized(4));
        assert_eq!(Body::from(b.clone()).get_ref(), b"test");
-        pin_mut!(b);

        assert_eq!(b.size(), BodySize::Sized(4));
        assert_eq!(
-            poll_fn(|cx| b.as_mut().poll_next(cx)).await.unwrap().ok(),
+            poll_fn(|cx| b.poll_next(cx)).await.unwrap().ok(),
            Some(Bytes::from("test"))
        );
    }

    #[actix_rt::test]
    async fn test_bytes_mut() {
-        let b = BytesMut::from("test");
+        let mut b = BytesMut::from("test");
        assert_eq!(Body::from(b.clone()).size(), BodySize::Sized(4));
        assert_eq!(Body::from(b.clone()).get_ref(), b"test");
-        pin_mut!(b);

        assert_eq!(b.size(), BodySize::Sized(4));
        assert_eq!(
-            poll_fn(|cx| b.as_mut().poll_next(cx)).await.unwrap().ok(),
+            poll_fn(|cx| b.poll_next(cx)).await.unwrap().ok(),
            Some(Bytes::from("test"))
        );
    }

    #[actix_rt::test]
    async fn test_string() {
-        let b = "test".to_owned();
+        let mut b = "test".to_owned();
        assert_eq!(Body::from(b.clone()).size(), BodySize::Sized(4));
        assert_eq!(Body::from(b.clone()).get_ref(), b"test");
        assert_eq!(Body::from(&b).size(), BodySize::Sized(4));
        assert_eq!(Body::from(&b).get_ref(), b"test");
-        pin_mut!(b);

        assert_eq!(b.size(), BodySize::Sized(4));
        assert_eq!(
-            poll_fn(|cx| b.as_mut().poll_next(cx)).await.unwrap().ok(),
+            poll_fn(|cx| b.poll_next(cx)).await.unwrap().ok(),
            Some(Bytes::from("test"))
        );
    }
@ -603,17 +547,14 @@ mod tests {
    #[actix_rt::test]
    async fn test_unit() {
        assert_eq!(().size(), BodySize::Empty);
-        assert!(poll_fn(|cx| Pin::new(&mut ()).poll_next(cx))
-            .await
-            .is_none());
+        assert!(poll_fn(|cx| ().poll_next(cx)).await.is_none());
    }

    #[actix_rt::test]
    async fn test_box() {
-        let val = Box::new(());
-        pin_mut!(val);
+        let mut val = Box::new(());
        assert_eq!(val.size(), BodySize::Empty);
-        assert!(poll_fn(|cx| val.as_mut().poll_next(cx)).await.is_none());
+        assert!(poll_fn(|cx| val.poll_next(cx)).await.is_none());
    }

    #[actix_rt::test]
@ -648,97 +589,4 @@ mod tests {
            BodySize::Sized(25)
        );
    }
-
-    mod body_stream {
-        use super::*;
-        //use futures::task::noop_waker;
-        //use futures::stream::once;
-
-        #[actix_rt::test]
-        async fn skips_empty_chunks() {
-            let body = BodyStream::new(stream::iter(
-                ["1", "", "2"]
-                    .iter()
-                    .map(|&v| Ok(Bytes::from(v)) as Result<Bytes, ()>),
-            ));
-            pin_mut!(body);
-
-            assert_eq!(
-                poll_fn(|cx| body.as_mut().poll_next(cx))
-                    .await
-                    .unwrap()
-                    .ok(),
-                Some(Bytes::from("1")),
-            );
-            assert_eq!(
-                poll_fn(|cx| body.as_mut().poll_next(cx))
-                    .await
-                    .unwrap()
-                    .ok(),
-                Some(Bytes::from("2")),
-            );
-        }
-
-        /* Now it does not compile as it should
-        #[actix_rt::test]
-        async fn move_pinned_pointer() {
-            let (sender, receiver) = futures::channel::oneshot::channel();
-            let mut body_stream = Ok(BodyStream::new(once(async {
-                let x = Box::new(0i32);
-                let y = &x;
-                receiver.await.unwrap();
-                let _z = **y;
-                Ok::<_, ()>(Bytes::new())
-            })));
-
-            let waker = noop_waker();
-            let mut context = Context::from_waker(&waker);
-            pin_mut!(body_stream);
-
-            let _ = body_stream.as_mut().unwrap().poll_next(&mut context);
-            sender.send(()).unwrap();
-            let _ = std::mem::replace(&mut body_stream, Err([0; 32])).unwrap().poll_next(&mut context);
-        }*/
-    }
-
-    mod sized_stream {
-        use super::*;
-
-        #[actix_rt::test]
-        async fn skips_empty_chunks() {
-            let body = SizedStream::new(
-                2,
-                stream::iter(["1", "", "2"].iter().map(|&v| Ok(Bytes::from(v)))),
-            );
-            pin_mut!(body);
-            assert_eq!(
-                poll_fn(|cx| body.as_mut().poll_next(cx))
-                    .await
-                    .unwrap()
-                    .ok(),
-                Some(Bytes::from("1")),
-            );
-            assert_eq!(
-                poll_fn(|cx| body.as_mut().poll_next(cx))
-                    .await
-                    .unwrap()
-                    .ok(),
-                Some(Bytes::from("2")),
-            );
-        }
-    }
-
-    #[actix_rt::test]
-    async fn test_body_casting() {
-        let mut body = String::from("hello cast");
-        let resp_body: &mut dyn MessageBody = &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_str("!");
-        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());
-    }
 }
--- a/actix-http/src/client/config.rs
+++ b/actix-http/src/client/config.rs
@ -1,39 +0,0 @@
-use std::time::Duration;
-
-// These values are taken from hyper/src/proto/h2/client.rs
-const DEFAULT_H2_CONN_WINDOW: u32 = 1024 * 1024 * 2; // 2mb
-const DEFAULT_H2_STREAM_WINDOW: u32 = 1024 * 1024; // 1mb
-
-/// Connector configuration
-#[derive(Clone)]
-pub(crate) struct ConnectorConfig {
-    pub(crate) timeout: Duration,
-    pub(crate) conn_lifetime: Duration,
-    pub(crate) conn_keep_alive: Duration,
-    pub(crate) disconnect_timeout: Option<Duration>,
-    pub(crate) limit: usize,
-    pub(crate) conn_window_size: u32,
-    pub(crate) stream_window_size: u32,
-}
-
-impl Default for ConnectorConfig {
-    fn default() -> Self {
-        Self {
-            timeout: Duration::from_secs(1),
-            conn_lifetime: Duration::from_secs(75),
-            conn_keep_alive: Duration::from_secs(15),
-            disconnect_timeout: Some(Duration::from_millis(3000)),
-            limit: 100,
-            conn_window_size: DEFAULT_H2_CONN_WINDOW,
-            stream_window_size: DEFAULT_H2_STREAM_WINDOW,
-        }
-    }
-}
-
-impl ConnectorConfig {
-    pub(crate) fn no_disconnect_timeout(&self) -> Self {
-        let mut res = self.clone();
-        res.disconnect_timeout = None;
-        res
-    }
-}
--- a/actix-http/src/client/connection.rs
+++ b/actix-http/src/client/connection.rs
@ -1,11 +1,10 @@
-use std::future::Future;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::{fmt, io, mem, time};

 use actix_codec::{AsyncRead, AsyncWrite, Framed};
 use bytes::{Buf, Bytes};
-use futures_util::future::{err, Either, FutureExt, LocalBoxFuture, Ready};
+use futures_util::future::{err, Either, Future, FutureExt, LocalBoxFuture, Ready};
 use h2::client::SendRequest;
 use pin_project::{pin_project, project};

--- a/actix-http/src/client/connector.rs
+++ b/actix-http/src/client/connector.rs
@ -11,7 +11,6 @@ use actix_service::{apply_fn, Service};
 use actix_utils::timeout::{TimeoutError, TimeoutService};
 use http::Uri;

-use super::config::ConnectorConfig;
 use super::connection::Connection;
 use super::error::ConnectError;
 use super::pool::{ConnectionPool, Protocol};
@ -49,7 +48,11 @@ type SslConnector = ();
 /// ```
 pub struct Connector<T, U> {
    connector: T,
-    config: ConnectorConfig,
+    timeout: Duration,
+    conn_lifetime: Duration,
+    conn_keep_alive: Duration,
+    disconnect_timeout: Duration,
+    limit: usize,
    #[allow(dead_code)]
    ssl: SslConnector,
    _t: PhantomData<U>,
@ -68,47 +71,42 @@ impl Connector<(), ()> {
            > + Clone,
        TcpStream,
    > {
+        let ssl = {
+            #[cfg(feature = "openssl")]
+            {
+                use actix_connect::ssl::openssl::SslMethod;
+
+                let mut ssl = OpensslConnector::builder(SslMethod::tls()).unwrap();
+                let _ = ssl
+                    .set_alpn_protos(b"\x02h2\x08http/1.1")
+                    .map_err(|e| error!("Can not set alpn protocol: {:?}", e));
+                SslConnector::Openssl(ssl.build())
+            }
+            #[cfg(all(not(feature = "openssl"), feature = "rustls"))]
+            {
+                let protos = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
+                let mut config = ClientConfig::new();
+                config.set_protocols(&protos);
+                config
+                    .root_store
+                    .add_server_trust_anchors(&actix_tls::rustls::TLS_SERVER_ROOTS);
+                SslConnector::Rustls(Arc::new(config))
+            }
+            #[cfg(not(any(feature = "openssl", feature = "rustls")))]
+            {}
+        };
+
        Connector {
-            ssl: Self::build_ssl(vec![b"h2".to_vec(), b"http/1.1".to_vec()]),
+            ssl,
            connector: default_connector(),
-            config: ConnectorConfig::default(),
+            timeout: Duration::from_secs(1),
+            conn_lifetime: Duration::from_secs(75),
+            conn_keep_alive: Duration::from_secs(15),
+            disconnect_timeout: Duration::from_millis(3000),
+            limit: 100,
            _t: PhantomData,
        }
    }
-
-    // Build Ssl connector with openssl, based on supplied alpn protocols
-    #[cfg(feature = "openssl")]
-    fn build_ssl(protocols: Vec<Vec<u8>>) -> SslConnector {
-        use actix_connect::ssl::openssl::SslMethod;
-        use bytes::{BufMut, BytesMut};
-
-        let mut alpn = BytesMut::with_capacity(20);
-        for proto in protocols.iter() {
-            alpn.put_u8(proto.len() as u8);
-            alpn.put(proto.as_slice());
-        }
-
-        let mut ssl = OpensslConnector::builder(SslMethod::tls()).unwrap();
-        let _ = ssl
-            .set_alpn_protos(&alpn)
-            .map_err(|e| error!("Can not set alpn protocol: {:?}", e));
-        SslConnector::Openssl(ssl.build())
-    }
-
-    // Build Ssl connector with rustls, based on supplied alpn protocols
-    #[cfg(all(not(feature = "openssl"), feature = "rustls"))]
-    fn build_ssl(protocols: Vec<Vec<u8>>) -> SslConnector {
-        let mut config = ClientConfig::new();
-        config.set_protocols(&protocols);
-        config
-            .root_store
-            .add_server_trust_anchors(&actix_tls::rustls::TLS_SERVER_ROOTS);
-        SslConnector::Rustls(Arc::new(config))
-    }
-
-    // ssl turned off, provides empty ssl connector
-    #[cfg(not(any(feature = "openssl", feature = "rustls")))]
-    fn build_ssl(_: Vec<Vec<u8>>) -> SslConnector {}
 }

 impl<T, U> Connector<T, U> {
@ -124,7 +122,11 @@ impl<T, U> Connector<T, U> {
    {
        Connector {
            connector,
-            config: self.config,
+            timeout: self.timeout,
+            conn_lifetime: self.conn_lifetime,
+            conn_keep_alive: self.conn_keep_alive,
+            disconnect_timeout: self.disconnect_timeout,
+            limit: self.limit,
            ssl: self.ssl,
            _t: PhantomData,
        }
@ -144,7 +146,7 @@ where
    /// Connection timeout, i.e. max time to connect to remote host including dns name resolution.
    /// Set to 1 second by default.
    pub fn timeout(mut self, timeout: Duration) -> Self {
-        self.config.timeout = timeout;
+        self.timeout = timeout;
        self
    }

@ -161,44 +163,12 @@ where
        self
    }

-    /// Maximum supported http major version
-    /// Supported versions http/1.1, http/2
-    pub fn max_http_version(mut self, val: http::Version) -> Self {
-        let versions = match val {
-            http::Version::HTTP_11 => vec![b"http/1.1".to_vec()],
-            http::Version::HTTP_2 => vec![b"h2".to_vec(), b"http/1.1".to_vec()],
-            _ => {
-                unimplemented!("actix-http:client: supported versions http/1.1, http/2")
-            }
-        };
-        self.ssl = Connector::build_ssl(versions);
-        self
-    }
-
-    /// Indicates the initial window size (in octets) for
-    /// HTTP2 stream-level flow control for received data.
-    ///
-    /// The default value is 65,535 and is good for APIs, but not for big objects.
-    pub fn initial_window_size(mut self, size: u32) -> Self {
-        self.config.stream_window_size = size;
-        self
-    }
-
-    /// Indicates the initial window size (in octets) for
-    /// HTTP2 connection-level flow control for received data.
-    ///
-    /// The default value is 65,535 and is good for APIs, but not for big objects.
-    pub fn initial_connection_window_size(mut self, size: u32) -> Self {
-        self.config.conn_window_size = size;
-        self
-    }
-
    /// Set total number of simultaneous connections per type of scheme.
    ///
    /// If limit is 0, the connector has no limit.
    /// The default limit size is 100.
    pub fn limit(mut self, limit: usize) -> Self {
-        self.config.limit = limit;
+        self.limit = limit;
        self
    }

@ -209,7 +179,7 @@ where
    /// exceeds this period, the connection is closed.
    /// Default keep-alive period is 15 seconds.
    pub fn conn_keep_alive(mut self, dur: Duration) -> Self {
-        self.config.conn_keep_alive = dur;
+        self.conn_keep_alive = dur;
        self
    }

@ -219,7 +189,7 @@ where
    /// until it is closed regardless of keep-alive period.
    /// Default lifetime period is 75 seconds.
    pub fn conn_lifetime(mut self, dur: Duration) -> Self {
-        self.config.conn_lifetime = dur;
+        self.conn_lifetime = dur;
        self
    }

@ -232,7 +202,7 @@ where
    ///
    /// By default disconnect timeout is set to 3000 milliseconds.
    pub fn disconnect_timeout(mut self, dur: Duration) -> Self {
-        self.config.disconnect_timeout = Some(dur);
+        self.disconnect_timeout = dur;
        self
    }

@ -246,7 +216,7 @@ where
        #[cfg(not(any(feature = "openssl", feature = "rustls")))]
        {
            let connector = TimeoutService::new(
-                self.config.timeout,
+                self.timeout,
                apply_fn(self.connector, |msg: Connect, srv| {
                    srv.call(TcpConnect::new(msg.uri).set_addr(msg.addr))
                })
@ -261,7 +231,10 @@ where
            connect_impl::InnerConnector {
                tcp_pool: ConnectionPool::new(
                    connector,
-                    self.config.no_disconnect_timeout(),
+                    self.conn_lifetime,
+                    self.conn_keep_alive,
+                    None,
+                    self.limit,
                ),
            }
        }
@ -275,7 +248,7 @@ where
            use actix_service::{boxed::service, pipeline};

            let ssl_service = TimeoutService::new(
-                self.config.timeout,
+                self.timeout,
                pipeline(
                    apply_fn(self.connector.clone(), |msg: Connect, srv| {
                        srv.call(TcpConnect::new(msg.uri).set_addr(msg.addr))
@ -328,7 +301,7 @@ where
            });

            let tcp_service = TimeoutService::new(
-                self.config.timeout,
+                self.timeout,
                apply_fn(self.connector, |msg: Connect, srv| {
                    srv.call(TcpConnect::new(msg.uri).set_addr(msg.addr))
                })
@ -343,9 +316,18 @@ where
            connect_impl::InnerConnector {
                tcp_pool: ConnectionPool::new(
                    tcp_service,
-                    self.config.no_disconnect_timeout(),
+                    self.conn_lifetime,
+                    self.conn_keep_alive,
+                    None,
+                    self.limit,
+                ),
+                ssl_pool: ConnectionPool::new(
+                    ssl_service,
+                    self.conn_lifetime,
+                    self.conn_keep_alive,
+                    Some(self.disconnect_timeout),
+                    self.limit,
                ),
-                ssl_pool: ConnectionPool::new(ssl_service, self.config),
            }
        }
    }
--- a/actix-http/src/client/error.rs
+++ b/actix-http/src/client/error.rs
@ -48,22 +48,20 @@ pub enum ConnectError {

    /// Unresolved host name
    #[display(fmt = "Connector received `Connect` method with unresolved host")]
-    Unresolved,
+    Unresolverd,

    /// Connection io error
    #[display(fmt = "{}", _0)]
    Io(io::Error),
 }

-impl std::error::Error for ConnectError {}
-
 impl From<actix_connect::ConnectError> for ConnectError {
    fn from(err: actix_connect::ConnectError) -> ConnectError {
        match err {
            actix_connect::ConnectError::Resolver(e) => ConnectError::Resolver(e),
            actix_connect::ConnectError::NoRecords => ConnectError::NoRecords,
            actix_connect::ConnectError::InvalidInput => panic!(),
-            actix_connect::ConnectError::Unresolved => ConnectError::Unresolved,
+            actix_connect::ConnectError::Unresolverd => ConnectError::Unresolverd,
            actix_connect::ConnectError::Io(e) => ConnectError::Io(e),
        }
    }
@ -88,8 +86,6 @@ pub enum InvalidUrl {
    HttpError(http::Error),
 }

-impl std::error::Error for InvalidUrl {}
-
 /// A set of errors that can occur during request sending and response reading
 #[derive(Debug, Display, From)]
 pub enum SendRequestError {
@ -119,8 +115,6 @@ pub enum SendRequestError {
    Body(Error),
 }

-impl std::error::Error for SendRequestError {}
-
 /// Convert `SendRequestError` to a server `Response`
 impl ResponseError for SendRequestError {
    fn status_code(&self) -> StatusCode {
@ -145,8 +139,6 @@ pub enum FreezeRequestError {
    Http(HttpError),
 }

-impl std::error::Error for FreezeRequestError {}
-
 impl From<FreezeRequestError> for SendRequestError {
    fn from(e: FreezeRequestError) -> Self {
        match e {
--- a/actix-http/src/client/h1proto.rs
+++ b/actix-http/src/client/h1proto.rs
@ -8,7 +8,7 @@ use bytes::buf::BufMutExt;
 use bytes::{Bytes, BytesMut};
 use futures_core::Stream;
 use futures_util::future::poll_fn;
-use futures_util::{pin_mut, SinkExt, StreamExt};
+use futures_util::{SinkExt, StreamExt};

 use crate::error::PayloadError;
 use crate::h1;
@ -120,7 +120,7 @@ where

 /// send request body to the peer
 pub(crate) async fn send_body<I, B>(
-    body: B,
+    mut body: B,
    framed: &mut Framed<I, h1::ClientCodec>,
 ) -> Result<(), SendRequestError>
 where
@ -128,10 +128,9 @@ where
    B: MessageBody,
 {
    let mut eof = false;
-    pin_mut!(body);
    while !eof {
        while !eof && !framed.is_write_buf_full() {
-            match poll_fn(|cx| body.as_mut().poll_next(cx)).await {
+            match poll_fn(|cx| body.poll_next(cx)).await {
                Some(result) => {
                    framed.write(h1::Message::Chunk(Some(result?)))?;
                }
--- a/actix-http/src/client/h2proto.rs
+++ b/actix-http/src/client/h2proto.rs
@ -1,15 +1,10 @@
 use std::convert::TryFrom;
-use std::future::Future;
 use std::time;

 use actix_codec::{AsyncRead, AsyncWrite};
 use bytes::Bytes;
 use futures_util::future::poll_fn;
-use futures_util::pin_mut;
-use h2::{
-    client::{Builder, Connection, SendRequest},
-    SendStream,
-};
+use h2::{client::SendRequest, SendStream};
 use http::header::{HeaderValue, CONNECTION, CONTENT_LENGTH, TRANSFER_ENCODING};
 use http::{request::Request, Method, Version};

@ -18,7 +13,6 @@ use crate::header::HeaderMap;
 use crate::message::{RequestHeadType, ResponseHead};
 use crate::payload::Payload;

-use super::config::ConnectorConfig;
 use super::connection::{ConnectionType, IoConnection};
 use super::error::SendRequestError;
 use super::pool::Acquired;
@ -64,6 +58,10 @@ where
            CONTENT_LENGTH,
            HeaderValue::try_from(format!("{}", len)).unwrap(),
        ),
+        BodySize::Sized64(len) => req.headers_mut().insert(
+            CONTENT_LENGTH,
+            HeaderValue::try_from(format!("{}", len)).unwrap(),
+        ),
    };

    // Extracting extra headers from RequestHeadType. HeaderMap::new() does not allocate.
@ -125,14 +123,13 @@ where
 }

 async fn send_body<B: MessageBody>(
-    body: B,
+    mut body: B,
    mut send: SendStream<Bytes>,
 ) -> Result<(), SendRequestError> {
    let mut buf = None;
-    pin_mut!(body);
    loop {
        if buf.is_none() {
-            match poll_fn(|cx| body.as_mut().poll_next(cx)).await {
+            match poll_fn(|cx| body.poll_next(cx)).await {
                Some(Ok(b)) => {
                    send.reserve_capacity(b.len());
                    buf = Some(b);
@ -186,18 +183,3 @@ fn release<T: AsyncRead + AsyncWrite + Unpin + 'static>(
        }
    }
 }
-
-pub(crate) fn handshake<Io>(
-    io: Io,
-    config: &ConnectorConfig,
-) -> impl Future<Output = Result<(SendRequest<Bytes>, Connection<Io, Bytes>), h2::Error>>
-where
-    Io: AsyncRead + AsyncWrite + Unpin + 'static,
-{
-    let mut builder = Builder::new();
-    builder
-        .initial_window_size(config.stream_window_size)
-        .initial_connection_window_size(config.conn_window_size)
-        .enable_push(false);
-    builder.handshake(io)
-}
--- a/actix-http/src/client/mod.rs
+++ b/actix-http/src/client/mod.rs
@ -1,7 +1,6 @@
 //! Http client api
 use http::Uri;

-mod config;
 mod connection;
 mod connector;
 mod error;
--- a/actix-http/src/client/pool.rs
+++ b/actix-http/src/client/pool.rs
@ -13,16 +13,13 @@ use actix_utils::{oneshot, task::LocalWaker};
 use bytes::Bytes;
 use futures_util::future::{poll_fn, FutureExt, LocalBoxFuture};
 use fxhash::FxHashMap;
-use h2::client::{Connection, SendRequest};
+use h2::client::{handshake, Connection, SendRequest};
 use http::uri::Authority;
 use indexmap::IndexSet;
-use pin_project::pin_project;
 use slab::Slab;

-use super::config::ConnectorConfig;
 use super::connection::{ConnectionType, IoConnection};
 use super::error::ConnectError;
-use super::h2proto::handshake;
 use super::Connect;

 #[derive(Clone, Copy, PartialEq)]
@ -52,11 +49,20 @@ where
    T: Service<Request = Connect, Response = (Io, Protocol), Error = ConnectError>
        + 'static,
 {
-    pub(crate) fn new(connector: T, config: ConnectorConfig) -> Self {
+    pub(crate) fn new(
+        connector: T,
+        conn_lifetime: Duration,
+        conn_keep_alive: Duration,
+        disconnect_timeout: Option<Duration>,
+        limit: usize,
+    ) -> Self {
        ConnectionPool(
            Rc::new(RefCell::new(connector)),
            Rc::new(RefCell::new(Inner {
-                config,
+                conn_lifetime,
+                conn_keep_alive,
+                disconnect_timeout,
+                limit,
                acquired: 0,
                waiters: Slab::new(),
                waiters_queue: IndexSet::new(),
@ -105,7 +111,7 @@ where
            let key = if let Some(authority) = req.uri.authority() {
                authority.clone().into()
            } else {
-                return Err(ConnectError::Unresolved);
+                return Err(ConnectError::Unresolverd);
            };

            // acquire connection
@ -122,8 +128,6 @@ where
                    // open tcp connection
                    let (io, proto) = connector.call(req).await?;

-                    let config = inner.borrow().config.clone();
-
                    let guard = OpenGuard::new(key, inner);

                    if proto == Protocol::Http1 {
@ -133,7 +137,7 @@ where
                            Some(guard.consume()),
                        ))
                    } else {
-                        let (snd, connection) = handshake(io, &config).await?;
+                        let (snd, connection) = handshake(io).await?;
                        actix_rt::spawn(connection.map(|_| ()));
                        Ok(IoConnection::new(
                            ConnectionType::H2(snd),
@ -195,7 +199,7 @@ where
        if let Some(i) = self.inner.take() {
            let mut inner = i.as_ref().borrow_mut();
            inner.release_waiter(&self.key, self.token);
-            inner.check_availability();
+            inner.check_availibility();
        }
    }
 }
@ -232,7 +236,7 @@ where
        if let Some(i) = self.inner.take() {
            let mut inner = i.as_ref().borrow_mut();
            inner.release();
-            inner.check_availability();
+            inner.check_availibility();
        }
    }
 }
@ -250,7 +254,10 @@ struct AvailableConnection<Io> {
 }

 pub(crate) struct Inner<Io> {
-    config: ConnectorConfig,
+    conn_lifetime: Duration,
+    conn_keep_alive: Duration,
+    disconnect_timeout: Option<Duration>,
+    limit: usize,
    acquired: usize,
    available: FxHashMap<Key, VecDeque<AvailableConnection<Io>>>,
    waiters: Slab<
@ -303,7 +310,7 @@ where

    fn acquire(&mut self, key: &Key, cx: &mut Context<'_>) -> Acquire<Io> {
        // check limits
-        if self.config.limit > 0 && self.acquired >= self.config.limit {
+        if self.limit > 0 && self.acquired >= self.limit {
            return Acquire::NotAvailable;
        }

@ -315,10 +322,10 @@ where
            let now = Instant::now();
            while let Some(conn) = connections.pop_back() {
                // check if it still usable
-                if (now - conn.used) > self.config.conn_keep_alive
-                    || (now - conn.created) > self.config.conn_lifetime
+                if (now - conn.used) > self.conn_keep_alive
+                    || (now - conn.created) > self.conn_lifetime
                {
-                    if let Some(timeout) = self.config.disconnect_timeout {
+                    if let Some(timeout) = self.disconnect_timeout {
                        if let ConnectionType::H1(io) = conn.io {
                            actix_rt::spawn(CloseConnection::new(io, timeout))
                        }
@ -330,7 +337,7 @@ where
                        match Pin::new(s).poll_read(cx, &mut buf) {
                            Poll::Pending => (),
                            Poll::Ready(Ok(n)) if n > 0 => {
-                                if let Some(timeout) = self.config.disconnect_timeout {
+                                if let Some(timeout) = self.disconnect_timeout {
                                    if let ConnectionType::H1(io) = io {
                                        actix_rt::spawn(CloseConnection::new(
                                            io, timeout,
@ -359,21 +366,21 @@ where
                created,
                used: Instant::now(),
            });
-        self.check_availability();
+        self.check_availibility();
    }

    fn release_close(&mut self, io: ConnectionType<Io>) {
        self.acquired -= 1;
-        if let Some(timeout) = self.config.disconnect_timeout {
+        if let Some(timeout) = self.disconnect_timeout {
            if let ConnectionType::H1(io) = io {
                actix_rt::spawn(CloseConnection::new(io, timeout))
            }
        }
-        self.check_availability();
+        self.check_availibility();
    }

-    fn check_availability(&self) {
-        if !self.waiters_queue.is_empty() && self.acquired < self.config.limit {
+    fn check_availibility(&self) {
+        if !self.waiters_queue.is_empty() && self.acquired < self.limit {
            self.waker.wake();
        }
    }
@ -415,7 +422,6 @@ where
    }
 }

-#[pin_project]
 struct ConnectorPoolSupport<T, Io>
 where
    Io: AsyncRead + AsyncWrite + Unpin + 'static,
@ -433,7 +439,7 @@ where
    type Output = ();

    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let this = self.project();
+        let this = unsafe { self.get_unchecked_mut() };

        let mut inner = this.inner.as_ref().borrow_mut();
        inner.waker.register(cx.waker());
@ -472,7 +478,6 @@ where
                        tx,
                        this.inner.clone(),
                        this.connector.call(connect),
-                        inner.config.clone(),
                    );
                }
            }
@ -483,12 +488,10 @@ where
    }
 }

-#[pin_project::pin_project(PinnedDrop)]
 struct OpenWaitingConnection<F, Io>
 where
    Io: AsyncRead + AsyncWrite + Unpin + 'static,
 {
-    #[pin]
    fut: F,
    key: Key,
    h2: Option<
@ -499,7 +502,6 @@ where
    >,
    rx: Option<oneshot::Sender<Result<IoConnection<Io>, ConnectError>>>,
    inner: Option<Rc<RefCell<Inner<Io>>>>,
-    config: ConnectorConfig,
 }

 impl<F, Io> OpenWaitingConnection<F, Io>
@ -512,7 +514,6 @@ where
        rx: oneshot::Sender<Result<IoConnection<Io>, ConnectError>>,
        inner: Rc<RefCell<Inner<Io>>>,
        fut: F,
-        config: ConnectorConfig,
    ) {
        actix_rt::spawn(OpenWaitingConnection {
            key,
@ -520,21 +521,19 @@ where
            h2: None,
            rx: Some(rx),
            inner: Some(inner),
-            config,
        })
    }
 }

-#[pin_project::pinned_drop]
-impl<F, Io> PinnedDrop for OpenWaitingConnection<F, Io>
+impl<F, Io> Drop for OpenWaitingConnection<F, Io>
 where
    Io: AsyncRead + AsyncWrite + Unpin + 'static,
 {
-    fn drop(self: Pin<&mut Self>) {
-        if let Some(inner) = self.project().inner.take() {
+    fn drop(&mut self) {
+        if let Some(inner) = self.inner.take() {
            let mut inner = inner.as_ref().borrow_mut();
            inner.release();
-            inner.check_availability();
+            inner.check_availibility();
        }
    }
 }
@ -546,8 +545,8 @@ where
 {
    type Output = ();

-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let this = self.as_mut().project();
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = unsafe { self.get_unchecked_mut() };

        if let Some(ref mut h2) = this.h2 {
            return match Pin::new(h2).poll(cx) {
@ -572,7 +571,7 @@ where
            };
        }

-        match this.fut.poll(cx) {
+        match unsafe { Pin::new_unchecked(&mut this.fut) }.poll(cx) {
            Poll::Ready(Err(err)) => {
                let _ = this.inner.take();
                if let Some(rx) = this.rx.take() {
@ -590,8 +589,8 @@ where
                    )));
                    Poll::Ready(())
                } else {
-                    *this.h2 = Some(handshake(io, this.config).boxed_local());
-                    self.poll(cx)
+                    this.h2 = Some(handshake(io).boxed_local());
+                    unsafe { Pin::new_unchecked(this) }.poll(cx)
                }
            }
            Poll::Pending => Poll::Pending,
--- a/actix-http/src/cloneable.rs
+++ b/actix-http/src/cloneable.rs
@ -1,4 +1,4 @@
-use std::cell::RefCell;
+use std::cell::UnsafeCell;
 use std::rc::Rc;
 use std::task::{Context, Poll};

@ -6,15 +6,11 @@ use actix_service::Service;

 #[doc(hidden)]
 /// Service that allows to turn non-clone service to a service with `Clone` impl
-///
-/// # Panics
-/// CloneableService might panic with some creative use of thread local storage.
-/// See https://github.com/actix/actix-web/issues/1295 for example
-pub(crate) struct CloneableService<T: Service>(Rc<RefCell<T>>);
+pub(crate) struct CloneableService<T: Service>(Rc<UnsafeCell<T>>);

 impl<T: Service> CloneableService<T> {
    pub(crate) fn new(service: T) -> Self {
-        Self(Rc::new(RefCell::new(service)))
+        Self(Rc::new(UnsafeCell::new(service)))
    }
 }

@ -31,10 +27,10 @@ impl<T: Service> Service for CloneableService<T> {
    type Future = T::Future;

    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.0.borrow_mut().poll_ready(cx)
+        unsafe { &mut *self.0.as_ref().get() }.poll_ready(cx)
    }

    fn call(&mut self, req: T::Request) -> Self::Future {
-        self.0.borrow_mut().call(req)
+        unsafe { &mut *self.0.as_ref().get() }.call(req)
    }
 }
--- a/actix-http/src/config.rs
+++ b/actix-http/src/config.rs
@ -1,4 +1,4 @@
-use std::cell::Cell;
+use std::cell::UnsafeCell;
 use std::fmt::Write;
 use std::rc::Rc;
 use std::time::Duration;
@ -7,7 +7,7 @@ use std::{fmt, net};
 use actix_rt::time::{delay_for, delay_until, Delay, Instant};
 use bytes::BytesMut;
 use futures_util::{future, FutureExt};
-use time::OffsetDateTime;
+use time;

 // "Sun, 06 Nov 1994 08:49:37 GMT".len()
 const DATE_VALUE_LENGTH: usize = 29;
@ -114,7 +114,7 @@ impl ServiceConfig {
    }

    #[inline]
-    /// Return state of connection keep-alive functionality
+    /// Return state of connection keep-alive funcitonality
    pub fn keep_alive_enabled(&self) -> bool {
        self.0.ka_enabled
    }
@ -211,12 +211,7 @@ impl Date {
    }
    fn update(&mut self) {
        self.pos = 0;
-        write!(
-            self,
-            "{}",
-            OffsetDateTime::now_utc().format("%a, %d %b %Y %H:%M:%S GMT")
-        )
-        .unwrap();
+        write!(self, "{}", time::at_utc(time::get_time()).rfc822()).unwrap();
    }
 }

@ -233,24 +228,24 @@ impl fmt::Write for Date {
 struct DateService(Rc<DateServiceInner>);

 struct DateServiceInner {
-    current: Cell<Option<(Date, Instant)>>,
+    current: UnsafeCell<Option<(Date, Instant)>>,
 }

 impl DateServiceInner {
    fn new() -> Self {
        DateServiceInner {
-            current: Cell::new(None),
+            current: UnsafeCell::new(None),
        }
    }

    fn reset(&self) {
-        self.current.take();
+        unsafe { (&mut *self.current.get()).take() };
    }

    fn update(&self) {
        let now = Instant::now();
        let date = Date::new();
-        self.current.set(Some((date, now)));
+        *(unsafe { &mut *self.current.get() }) = Some((date, now));
    }
 }

@ -260,7 +255,7 @@ impl DateService {
    }

    fn check_date(&self) {
-        if self.0.current.get().is_none() {
+        if unsafe { (&*self.0.current.get()).is_none() } {
            self.0.update();

            // periodic date update
@ -274,12 +269,12 @@ impl DateService {

    fn now(&self) -> Instant {
        self.check_date();
-        self.0.current.get().unwrap().1
+        unsafe { (&*self.0.current.get()).as_ref().unwrap().1 }
    }

    fn set_date<F: FnMut(&Date)>(&self, mut f: F) {
        self.check_date();
-        f(&self.0.current.get().unwrap().0);
+        f(&unsafe { (&*self.0.current.get()).as_ref().unwrap().0 })
    }
 }

@ -287,16 +282,6 @@ impl DateService {
 mod tests {
    use super::*;

-    // Test modifying the date from within the closure
-    // passed to `set_date`
-    #[test]
-    fn test_evil_date() {
-        let service = DateService::new();
-        // Make sure that `check_date` doesn't try to spawn a task
-        service.0.update();
-        service.set_date(|_| service.0.reset());
-    }
-
    #[test]
    fn test_date_len() {
        assert_eq!(DATE_VALUE_LENGTH, "Sun, 06 Nov 1994 08:49:37 GMT".len());
--- a/actix-http/src/cookie/builder.rs
+++ b/actix-http/src/cookie/builder.rs
@ -1,6 +1,7 @@
 use std::borrow::Cow;

-use time::{Duration, OffsetDateTime};
+use chrono::Duration;
+use time::Tm;

 use super::{Cookie, SameSite};

@ -63,13 +64,13 @@ impl CookieBuilder {
    /// use actix_http::cookie::Cookie;
    ///
    /// let c = Cookie::build("foo", "bar")
-    ///     .expires(time::OffsetDateTime::now_utc())
+    ///     .expires(time::now())
    ///     .finish();
    ///
    /// assert!(c.expires().is_some());
    /// ```
    #[inline]
-    pub fn expires(mut self, when: OffsetDateTime) -> CookieBuilder {
+    pub fn expires(mut self, when: Tm) -> CookieBuilder {
        self.cookie.set_expires(when);
        self
    }
@ -107,10 +108,7 @@ impl CookieBuilder {
    /// ```
    #[inline]
    pub fn max_age_time(mut self, value: Duration) -> CookieBuilder {
-        // Truncate any nanoseconds from the Duration, as they aren't represented within `Max-Age`
-        // and would cause two otherwise identical `Cookie` instances to not be equivalent to one another.
-        self.cookie
-            .set_max_age(Duration::seconds(value.whole_seconds()));
+        self.cookie.set_max_age(value);
        self
    }

@ -214,7 +212,7 @@ impl CookieBuilder {
    ///
    /// ```rust
    /// use actix_http::cookie::Cookie;
-    /// use time::Duration;
+    /// use chrono::Duration;
    ///
    /// let c = Cookie::build("foo", "bar")
    ///     .permanent()
--- a/actix-http/src/cookie/draft.rs
+++ b/actix-http/src/cookie/draft.rs
@ -10,26 +10,18 @@ use std::fmt;
 /// attribute is "Strict", then the cookie is never sent in cross-site requests.
 /// If the `SameSite` attribute is "Lax", the cookie is only sent in cross-site
 /// requests with "safe" HTTP methods, i.e, `GET`, `HEAD`, `OPTIONS`, `TRACE`.
-/// If the `SameSite` attribute is not present then the cookie will be sent as
-/// normal. In some browsers, this will implicitly handle the cookie as if "Lax"
-/// and in others, "None". It's best to explicitly set the `SameSite` attribute
-/// to avoid inconsistent behavior.
-///
-/// **Note:** Depending on browser, the `Secure` attribute may be required for
-/// `SameSite` "None" cookies to be accepted.
+/// If the `SameSite` attribute is not present (made explicit via the
+/// `SameSite::None` variant), then the cookie will be sent as normal.
 ///
 /// **Note:** This cookie attribute is an HTTP draft! Its meaning and definition
 /// are subject to change.
-///
-/// More info about these draft changes can be found in the draft spec:
-/// - https://tools.ietf.org/html/draft-west-cookie-incrementalism-00
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum SameSite {
    /// The "Strict" `SameSite` attribute.
    Strict,
    /// The "Lax" `SameSite` attribute.
    Lax,
-    /// The "None" `SameSite` attribute.
+    /// No `SameSite` attribute.
    None,
 }

@ -100,7 +92,7 @@ impl fmt::Display for SameSite {
        match *self {
            SameSite::Strict => write!(f, "Strict"),
            SameSite::Lax => write!(f, "Lax"),
-            SameSite::None => write!(f, "None"),
+            SameSite::None => Ok(()),
        }
    }
 }
--- a/actix-http/src/cookie/jar.rs
+++ b/actix-http/src/cookie/jar.rs
@ -1,7 +1,7 @@
 use std::collections::HashSet;
-use std::mem;
+use std::mem::replace;

-use time::{Duration, OffsetDateTime};
+use chrono::Duration;

 use super::delta::DeltaCookie;
 use super::Cookie;
@ -13,7 +13,7 @@ use super::secure::{Key, PrivateJar, SignedJar};
 ///
 /// A `CookieJar` provides storage for any number of cookies. Any changes made
 /// to the jar are tracked; the changes can be retrieved via the
-/// [delta](#method.delta) method which returns an iterator over the changes.
+/// [delta](#method.delta) method which returns an interator over the changes.
 ///
 /// # Usage
 ///
@ -188,7 +188,7 @@ impl CookieJar {
    ///
    /// ```rust
    /// use actix_http::cookie::{CookieJar, Cookie};
-    /// use time::Duration;
+    /// use chrono::Duration;
    ///
    /// let mut jar = CookieJar::new();
    ///
@ -202,7 +202,7 @@ impl CookieJar {
    /// let delta: Vec<_> = jar.delta().collect();
    /// assert_eq!(delta.len(), 1);
    /// assert_eq!(delta[0].name(), "name");
-    /// assert_eq!(delta[0].max_age(), Some(Duration::zero()));
+    /// assert_eq!(delta[0].max_age(), Some(Duration::seconds(0)));
    /// ```
    ///
    /// Removing a new cookie does not result in a _removal_ cookie:
@ -220,8 +220,8 @@ impl CookieJar {
    pub fn remove(&mut self, mut cookie: Cookie<'static>) {
        if self.original_cookies.contains(cookie.name()) {
            cookie.set_value("");
-            cookie.set_max_age(Duration::zero());
-            cookie.set_expires(OffsetDateTime::now_utc() - Duration::days(365));
+            cookie.set_max_age(Duration::seconds(0));
+            cookie.set_expires(time::now() - Duration::days(365));
            self.delta_cookies.replace(DeltaCookie::removed(cookie));
        } else {
            self.delta_cookies.remove(cookie.name());
@ -239,7 +239,7 @@ impl CookieJar {
    ///
    /// ```rust
    /// use actix_http::cookie::{CookieJar, Cookie};
-    /// use time::Duration;
+    /// use chrono::Duration;
    ///
    /// let mut jar = CookieJar::new();
    ///
@ -273,7 +273,7 @@ impl CookieJar {
    )]
    pub fn clear(&mut self) {
        self.delta_cookies.clear();
-        for delta in mem::take(&mut self.original_cookies) {
+        for delta in replace(&mut self.original_cookies, HashSet::new()) {
            self.remove(delta.cookie);
        }
    }
@ -533,8 +533,8 @@ mod test {
    #[test]
    #[cfg(feature = "secure-cookies")]
    fn delta() {
+        use chrono::Duration;
        use std::collections::HashMap;
-        use time::Duration;

        let mut c = CookieJar::new();

@ -556,7 +556,7 @@ mod test {
        assert!(names.get("test2").unwrap().is_none());
        assert!(names.get("test3").unwrap().is_none());
        assert!(names.get("test4").unwrap().is_none());
-        assert_eq!(names.get("original").unwrap(), &Some(Duration::zero()));
+        assert_eq!(names.get("original").unwrap(), &Some(Duration::seconds(0)));
    }

    #[test]
--- a/actix-http/src/cookie/mod.rs
+++ b/actix-http/src/cookie/mod.rs
@ -65,8 +65,9 @@ use std::borrow::Cow;
 use std::fmt;
 use std::str::FromStr;

+use chrono::Duration;
 use percent_encoding::{percent_encode, AsciiSet, CONTROLS};
-use time::{Duration, OffsetDateTime};
+use time::Tm;

 pub use self::builder::CookieBuilder;
 pub use self::draft::*;
@ -103,7 +104,7 @@ enum CookieStr {

 impl CookieStr {
    /// Retrieves the string `self` corresponds to. If `self` is derived from
-    /// indexes, the corresponding sub-slice of `string` is returned. Otherwise,
+    /// indexes, the corresponding subslice of `string` is returned. Otherwise,
    /// the concrete string is returned.
    ///
    /// # Panics
@ -171,7 +172,7 @@ pub struct Cookie<'c> {
    /// The cookie's value.
    value: CookieStr,
    /// The cookie's expiration, if any.
-    expires: Option<OffsetDateTime>,
+    expires: Option<Tm>,
    /// The cookie's maximum age, if any.
    max_age: Option<Duration>,
    /// The cookie's domain, if any.
@ -478,7 +479,7 @@ impl<'c> Cookie<'c> {
    /// assert_eq!(c.max_age(), None);
    ///
    /// let c = Cookie::parse("name=value; Max-Age=3600").unwrap();
-    /// assert_eq!(c.max_age().map(|age| age.whole_hours()), Some(1));
+    /// assert_eq!(c.max_age().map(|age| age.num_hours()), Some(1));
    /// ```
    #[inline]
    pub fn max_age(&self) -> Option<Duration> {
@ -543,10 +544,10 @@ impl<'c> Cookie<'c> {
    /// let expire_time = "Wed, 21 Oct 2017 07:28:00 GMT";
    /// let cookie_str = format!("name=value; Expires={}", expire_time);
    /// let c = Cookie::parse(cookie_str).unwrap();
-    /// assert_eq!(c.expires().map(|t| t.year()), Some(2017));
+    /// assert_eq!(c.expires().map(|t| t.tm_year), Some(117));
    /// ```
    #[inline]
-    pub fn expires(&self) -> Option<OffsetDateTime> {
+    pub fn expires(&self) -> Option<Tm> {
        self.expires
    }

@ -644,7 +645,7 @@ impl<'c> Cookie<'c> {
    ///
    /// ```rust
    /// use actix_http::cookie::Cookie;
-    /// use time::Duration;
+    /// use chrono::Duration;
    ///
    /// let mut c = Cookie::new("name", "value");
    /// assert_eq!(c.max_age(), None);
@ -697,19 +698,18 @@ impl<'c> Cookie<'c> {
    ///
    /// ```rust
    /// use actix_http::cookie::Cookie;
-    /// use time::{Duration, OffsetDateTime};
    ///
    /// let mut c = Cookie::new("name", "value");
    /// assert_eq!(c.expires(), None);
    ///
-    /// let mut now = OffsetDateTime::now();
-    /// now += Duration::week();
+    /// let mut now = time::now();
+    /// now.tm_year += 1;
    ///
    /// c.set_expires(now);
    /// assert!(c.expires().is_some())
    /// ```
    #[inline]
-    pub fn set_expires(&mut self, time: OffsetDateTime) {
+    pub fn set_expires(&mut self, time: Tm) {
        self.expires = Some(time);
    }

@ -720,7 +720,7 @@ impl<'c> Cookie<'c> {
    ///
    /// ```rust
    /// use actix_http::cookie::Cookie;
-    /// use time::Duration;
+    /// use chrono::Duration;
    ///
    /// let mut c = Cookie::new("foo", "bar");
    /// assert!(c.expires().is_none());
@ -733,7 +733,7 @@ impl<'c> Cookie<'c> {
    pub fn make_permanent(&mut self) {
        let twenty_years = Duration::days(365 * 20);
        self.set_max_age(twenty_years);
-        self.set_expires(OffsetDateTime::now_utc() + twenty_years);
+        self.set_expires(time::now() + twenty_years);
    }

    fn fmt_parameters(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@ -746,7 +746,9 @@ impl<'c> Cookie<'c> {
        }

        if let Some(same_site) = self.same_site() {
-            write!(f, "; SameSite={}", same_site)?;
+            if !same_site.is_none() {
+                write!(f, "; SameSite={}", same_site)?;
+            }
        }

        if let Some(path) = self.path() {
@ -758,11 +760,11 @@ impl<'c> Cookie<'c> {
        }

        if let Some(max_age) = self.max_age() {
-            write!(f, "; Max-Age={}", max_age.whole_seconds())?;
+            write!(f, "; Max-Age={}", max_age.num_seconds())?;
        }

        if let Some(time) = self.expires() {
-            write!(f, "; Expires={}", time.format("%a, %d %b %Y %H:%M:%S GMT"))?;
+            write!(f, "; Expires={}", time.rfc822())?;
        }

        Ok(())
@ -990,7 +992,7 @@ impl<'a, 'b> PartialEq<Cookie<'b>> for Cookie<'a> {
 #[cfg(test)]
 mod tests {
    use super::{Cookie, SameSite};
-    use time::PrimitiveDateTime;
+    use time::strptime;

    #[test]
    fn format() {
@ -1015,9 +1017,7 @@ mod tests {
        assert_eq!(&cookie.to_string(), "foo=bar; Domain=www.rust-lang.org");

        let time_str = "Wed, 21 Oct 2015 07:28:00 GMT";
-        let expires = PrimitiveDateTime::parse(time_str, "%a, %d %b %Y %H:%M:%S")
-            .unwrap()
-            .assume_utc();
+        let expires = strptime(time_str, "%a, %d %b %Y %H:%M:%S %Z").unwrap();
        let cookie = Cookie::build("foo", "bar").expires(expires).finish();
        assert_eq!(
            &cookie.to_string(),
@ -1037,7 +1037,7 @@ mod tests {
        let cookie = Cookie::build("foo", "bar")
            .same_site(SameSite::None)
            .finish();
-        assert_eq!(&cookie.to_string(), "foo=bar; SameSite=None");
+        assert_eq!(&cookie.to_string(), "foo=bar");
    }

    #[test]
--- a/actix-http/src/cookie/parse.rs
+++ b/actix-http/src/cookie/parse.rs
@ -5,13 +5,11 @@ use std::error::Error;
 use std::fmt;
 use std::str::Utf8Error;

+use chrono::Duration;
 use percent_encoding::percent_decode;
-use time::Duration;

 use super::{Cookie, CookieStr, SameSite};

-use crate::time_parser;
-
 /// Enum corresponding to a parsing error.
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum ParseError {
@ -149,7 +147,7 @@ fn parse_inner<'c>(s: &str, decode: bool) -> Result<Cookie<'c>, ParseError> {
                    Ok(val) => {
                        // Don't panic if the max age seconds is greater than what's supported by
                        // `Duration`.
-                        let val = cmp::min(val, Duration::max_value().whole_seconds());
+                        let val = cmp::min(val, Duration::max_value().num_seconds());
                        Some(Duration::seconds(val))
                    }
                    Err(_) => continue,
@ -172,8 +170,6 @@ fn parse_inner<'c>(s: &str, decode: bool) -> Result<Cookie<'c>, ParseError> {
                    cookie.same_site = Some(SameSite::Strict);
                } else if v.eq_ignore_ascii_case("lax") {
                    cookie.same_site = Some(SameSite::Lax);
-                } else if v.eq_ignore_ascii_case("none") {
-                    cookie.same_site = Some(SameSite::None);
                } else {
                    // We do nothing here, for now. When/if the `SameSite`
                    // attribute becomes standard, the spec says that we should
@ -183,14 +179,16 @@ fn parse_inner<'c>(s: &str, decode: bool) -> Result<Cookie<'c>, ParseError> {
                }
            }
            ("expires", Some(v)) => {
-                // Try parsing with three date formats according to
+                // Try strptime with three date formats according to
                // http://tools.ietf.org/html/rfc2616#section-3.3.1. Try
                // additional ones as encountered in the real world.
-                let tm = time_parser::parse_http_date(v)
-                    .or_else(|| time::parse(v, "%a, %d-%b-%Y %H:%M:%S").ok());
+                let tm = time::strptime(v, "%a, %d %b %Y %H:%M:%S %Z")
+                    .or_else(|_| time::strptime(v, "%A, %d-%b-%y %H:%M:%S %Z"))
+                    .or_else(|_| time::strptime(v, "%a, %d-%b-%Y %H:%M:%S %Z"))
+                    .or_else(|_| time::strptime(v, "%a %b %d %H:%M:%S %Y"));

-                if let Some(time) = tm {
-                    cookie.expires = Some(time.assume_utc())
+                if let Ok(time) = tm {
+                    cookie.expires = Some(time)
                }
            }
            _ => {
@ -218,7 +216,8 @@ where
 #[cfg(test)]
 mod tests {
    use super::{Cookie, SameSite};
-    use time::{Duration, PrimitiveDateTime};
+    use chrono::Duration;
+    use time::strptime;

    macro_rules! assert_eq_parse {
        ($string:expr, $expected:expr) => {
@ -263,16 +262,6 @@ mod tests {
        assert_eq_parse!("foo=bar; SameSite=strict", expected);
        assert_eq_parse!("foo=bar; SameSite=STrICT", expected);
        assert_eq_parse!("foo=bar; SameSite=STRICT", expected);
-
-        let expected = Cookie::build("foo", "bar")
-            .same_site(SameSite::None)
-            .finish();
-
-        assert_eq_parse!("foo=bar; SameSite=None", expected);
-        assert_eq_parse!("foo=bar; SameSITE=None", expected);
-        assert_eq_parse!("foo=bar; SameSite=nOne", expected);
-        assert_eq_parse!("foo=bar; SameSite=NoNE", expected);
-        assert_eq_parse!("foo=bar; SameSite=NONE", expected);
    }

    #[test]
@ -388,9 +377,7 @@ mod tests {
        );

        let time_str = "Wed, 21 Oct 2015 07:28:00 GMT";
-        let expires = PrimitiveDateTime::parse(time_str, "%a, %d %b %Y %H:%M:%S")
-            .unwrap()
-            .assume_utc();
+        let expires = strptime(time_str, "%a, %d %b %Y %H:%M:%S %Z").unwrap();
        expected.set_expires(expires);
        assert_eq_parse!(
            " foo=bar ;HttpOnly; Secure; Max-Age=4; Path=/foo; \
@ -399,38 +386,13 @@ mod tests {
        );

        unexpected.set_domain("foo.com");
-        let bad_expires = PrimitiveDateTime::parse(time_str, "%a, %d %b %Y %H:%S:%M")
-            .unwrap()
-            .assume_utc();
+        let bad_expires = strptime(time_str, "%a, %d %b %Y %H:%S:%M %Z").unwrap();
        expected.set_expires(bad_expires);
        assert_ne_parse!(
            " foo=bar ;HttpOnly; Secure; Max-Age=4; Path=/foo; \
             Domain=foo.com; Expires=Wed, 21 Oct 2015 07:28:00 GMT",
            unexpected
        );
-
-        expected.set_expires(expires);
-        expected.set_same_site(SameSite::Lax);
-        assert_eq_parse!(
-            " foo=bar ;HttpOnly; Secure; Max-Age=4; Path=/foo; \
-             Domain=foo.com; Expires=Wed, 21 Oct 2015 07:28:00 GMT; \
-             SameSite=Lax",
-            expected
-        );
-        expected.set_same_site(SameSite::Strict);
-        assert_eq_parse!(
-            " foo=bar ;HttpOnly; Secure; Max-Age=4; Path=/foo; \
-             Domain=foo.com; Expires=Wed, 21 Oct 2015 07:28:00 GMT; \
-             SameSite=Strict",
-            expected
-        );
-        expected.set_same_site(SameSite::None);
-        assert_eq_parse!(
-            " foo=bar ;HttpOnly; Secure; Max-Age=4; Path=/foo; \
-             Domain=foo.com; Expires=Wed, 21 Oct 2015 07:28:00 GMT; \
-             SameSite=None",
-            expected
-        );
    }

    #[test]
@ -452,16 +414,8 @@ mod tests {

    #[test]
    fn do_not_panic_on_large_max_ages() {
-        let max_duration = Duration::max_value();
-        let expected = Cookie::build("foo", "bar")
-            .max_age_time(max_duration)
-            .finish();
-        let overflow_duration = max_duration
-            .checked_add(Duration::nanoseconds(1))
-            .unwrap_or(max_duration);
-        assert_eq_parse!(
-            format!(" foo=bar; Max-Age={:?}", overflow_duration.whole_seconds()),
-            expected
-        );
+        let max_seconds = Duration::max_value().num_seconds();
+        let expected = Cookie::build("foo", "bar").max_age(max_seconds).finish();
+        assert_eq_parse!(format!(" foo=bar; Max-Age={:?}", max_seconds + 1), expected);
    }
 }
--- a/actix-http/src/cookie/secure/key.rs
+++ b/actix-http/src/cookie/secure/key.rs
@ -84,7 +84,7 @@ impl Key {
    }

    /// Generates signing/encryption keys from a secure, random source. Keys are
-    /// generated non-deterministically.
+    /// generated nondeterministically.
    ///
    /// # Panics
    ///
@ -103,7 +103,7 @@ impl Key {
    }

    /// Attempts to generate signing/encryption keys from a secure, random
-    /// source. Keys are generated non-deterministically. If randomness cannot be
+    /// source. Keys are generated nondeterministically. If randomness cannot be
    /// retrieved from the underlying operating system, returns `None`.
    ///
    /// # Example
--- a/actix-http/src/encoding/encoder.rs
+++ b/actix-http/src/encoding/encoder.rs
@ -9,7 +9,6 @@ use brotli2::write::BrotliEncoder;
 use bytes::Bytes;
 use flate2::write::{GzEncoder, ZlibEncoder};
 use futures_core::ready;
-use pin_project::{pin_project, project};

 use crate::body::{Body, BodySize, MessageBody, ResponseBody};
 use crate::http::header::{ContentEncoding, CONTENT_ENCODING};
@ -20,10 +19,8 @@ use super::Writer;

 const INPLACE: usize = 1024;

-#[pin_project]
 pub struct Encoder<B> {
    eof: bool,
-    #[pin]
    body: EncoderBody<B>,
    encoder: Option<ContentEncoder>,
    fut: Option<CpuFuture<ContentEncoder, io::Error>>,
@ -79,88 +76,67 @@ impl<B: MessageBody> Encoder<B> {
    }
 }

-#[pin_project]
 enum EncoderBody<B> {
    Bytes(Bytes),
-    Stream(#[pin] B),
-    BoxedStream(Box<dyn MessageBody + Unpin>),
-}
-
-impl<B: MessageBody> MessageBody for EncoderBody<B> {
-    fn size(&self) -> BodySize {
-        match self {
-            EncoderBody::Bytes(ref b) => b.size(),
-            EncoderBody::Stream(ref b) => b.size(),
-            EncoderBody::BoxedStream(ref b) => b.size(),
-        }
-    }
-
-    #[project]
-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
-        #[project]
-        match self.project() {
-            EncoderBody::Bytes(b) => {
-                if b.is_empty() {
-                    Poll::Ready(None)
-                } else {
-                    Poll::Ready(Some(Ok(std::mem::take(b))))
-                }
-            }
-            EncoderBody::Stream(b) => b.poll_next(cx),
-            EncoderBody::BoxedStream(ref mut b) => Pin::new(b.as_mut()).poll_next(cx),
-        }
-    }
+    Stream(B),
+    BoxedStream(Box<dyn MessageBody>),
 }

 impl<B: MessageBody> MessageBody for Encoder<B> {
    fn size(&self) -> BodySize {
        if self.encoder.is_none() {
-            self.body.size()
+            match self.body {
+                EncoderBody::Bytes(ref b) => b.size(),
+                EncoderBody::Stream(ref b) => b.size(),
+                EncoderBody::BoxedStream(ref b) => b.size(),
+            }
        } else {
            BodySize::Stream
        }
    }

-    fn poll_next(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Poll<Option<Result<Bytes, Error>>> {
-        let mut this = self.project();
+    fn poll_next(&mut self, cx: &mut Context<'_>) -> Poll<Option<Result<Bytes, Error>>> {
        loop {
-            if *this.eof {
+            if self.eof {
                return Poll::Ready(None);
            }

-            if let Some(ref mut fut) = this.fut {
+            if let Some(ref mut fut) = self.fut {
                let mut encoder = match ready!(Pin::new(fut).poll(cx)) {
                    Ok(item) => item,
                    Err(e) => return Poll::Ready(Some(Err(e.into()))),
                };
                let chunk = encoder.take();
-                *this.encoder = Some(encoder);
-                this.fut.take();
+                self.encoder = Some(encoder);
+                self.fut.take();
                if !chunk.is_empty() {
                    return Poll::Ready(Some(Ok(chunk)));
                }
            }

-            let result = this.body.as_mut().poll_next(cx);
-
+            let result = match self.body {
+                EncoderBody::Bytes(ref mut b) => {
+                    if b.is_empty() {
+                        Poll::Ready(None)
+                    } else {
+                        Poll::Ready(Some(Ok(std::mem::replace(b, Bytes::new()))))
+                    }
+                }
+                EncoderBody::Stream(ref mut b) => b.poll_next(cx),
+                EncoderBody::BoxedStream(ref mut b) => b.poll_next(cx),
+            };
            match result {
                Poll::Ready(Some(Ok(chunk))) => {
-                    if let Some(mut encoder) = this.encoder.take() {
+                    if let Some(mut encoder) = self.encoder.take() {
                        if chunk.len() < INPLACE {
                            encoder.write(&chunk)?;
                            let chunk = encoder.take();
-                            *this.encoder = Some(encoder);
+                            self.encoder = Some(encoder);
                            if !chunk.is_empty() {
                                return Poll::Ready(Some(Ok(chunk)));
                            }
                        } else {
-                            *this.fut = Some(run(move || {
+                            self.fut = Some(run(move || {
                                encoder.write(&chunk)?;
                                Ok(encoder)
                            }));
@ -170,12 +146,12 @@ impl<B: MessageBody> MessageBody for Encoder<B> {
                    }
                }
                Poll::Ready(None) => {
-                    if let Some(encoder) = this.encoder.take() {
+                    if let Some(encoder) = self.encoder.take() {
                        let chunk = encoder.finish()?;
                        if chunk.is_empty() {
                            return Poll::Ready(None);
                        } else {
-                            *this.eof = true;
+                            self.eof = true;
                            return Poll::Ready(Some(Ok(chunk)));
                        }
                    } else {
--- a/actix-http/src/error.rs
+++ b/actix-http/src/error.rs
@ -1,4 +1,5 @@
 //! Error and Result module
+use std::any::TypeId;
 use std::cell::RefCell;
 use std::io::Write;
 use std::str::Utf8Error;
@ -14,11 +15,12 @@ use derive_more::{Display, From};
 pub use futures_channel::oneshot::Canceled;
 use http::uri::InvalidUri;
 use http::{header, Error as HttpError, StatusCode};
+use httparse;
 use serde::de::value::Error as DeError;
 use serde_json::error::Error as JsonError;
 use serde_urlencoded::ser::Error as FormError;

-// re-export for convenience
+// re-export for convinience
 use crate::body::Body;
 pub use crate::cookie::ParseError as CookieParseError;
 use crate::helpers::Writer;
@ -34,7 +36,7 @@ pub type Result<T, E = Error> = result::Result<T, E>;

 /// General purpose actix web error.
 ///
-/// An actix web error is used to carry errors from `std::error`
+/// An actix web error is used to carry errors from `failure` or `std::error`
 /// through actix in a convenient way.  It can be created through
 /// converting errors with `into()`.
 ///
@ -81,10 +83,25 @@ pub trait ResponseError: fmt::Debug + fmt::Display {
        resp.set_body(Body::from(buf))
    }

-    downcast_get_type_id!();
+    #[doc(hidden)]
+    fn __private_get_type_id__(&self) -> TypeId
+    where
+        Self: 'static,
+    {
+        TypeId::of::<Self>()
+    }
 }

-downcast!(ResponseError);
+impl dyn ResponseError + 'static {
+    /// Downcasts a response error to a specific type.
+    pub fn downcast_ref<T: ResponseError + 'static>(&self) -> Option<&T> {
+        if self.__private_get_type_id__() == TypeId::of::<T>() {
+            unsafe { Some(&*(self as *const dyn ResponseError as *const T)) }
+        } else {
+            None
+        }
+    }
+}

 impl fmt::Display for Error {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@ -333,8 +350,6 @@ pub enum PayloadError {
    Io(io::Error),
 }

-impl std::error::Error for PayloadError {}
-
 impl From<h2::Error> for PayloadError {
    fn from(err: h2::Error) -> Self {
        PayloadError::Http2Payload(err)
@ -432,7 +447,7 @@ pub enum DispatchError {
    Unknown,
 }

-/// A set of error that can occur during parsing content type
+/// A set of error that can occure during parsing content type
 #[derive(PartialEq, Debug, Display)]
 pub enum ContentTypeError {
    /// Can not parse content type
@ -443,8 +458,6 @@ pub enum ContentTypeError {
    UnknownEncoding,
 }

-impl std::error::Error for ContentTypeError {}
-
 /// Return `BadRequest` for `ContentTypeError`
 impl ResponseError for ContentTypeError {
    fn status_code(&self) -> StatusCode {
@ -950,15 +963,9 @@ where
    InternalError::new(err, StatusCode::NETWORK_AUTHENTICATION_REQUIRED).into()
 }

-#[cfg(feature = "actors")]
-/// `InternalServerError` for `actix::MailboxError`
-/// This is supported on feature=`actors` only
-impl ResponseError for actix::MailboxError {}
-
-#[cfg(feature = "actors")]
-/// `InternalServerError` for `actix::ResolverError`
-/// This is supported on feature=`actors` only
-impl ResponseError for actix::actors::resolver::ResolverError {}
+#[cfg(feature = "failure")]
+/// Compatibility for `failure::Error`
+impl ResponseError for fail_ure::Error {}

 #[cfg(test)]
 mod tests {
--- a/actix-http/src/extensions.rs
+++ b/actix-http/src/extensions.rs
@ -6,8 +6,6 @@ use fxhash::FxHashMap;
 #[derive(Default)]
 /// A type map of request extensions.
 pub struct Extensions {
-    /// Use FxHasher with a std HashMap with for faster
-    /// lookups on the small `TypeId` (u64 equivalent) keys.
    map: FxHashMap<TypeId, Box<dyn Any>>,
 }

@ -30,30 +28,33 @@ impl Extensions {

    /// Check if container contains entry
    pub fn contains<T: 'static>(&self) -> bool {
-        self.map.contains_key(&TypeId::of::<T>())
+        self.map.get(&TypeId::of::<T>()).is_some()
    }

    /// Get a reference to a type previously inserted on this `Extensions`.
    pub fn get<T: 'static>(&self) -> Option<&T> {
        self.map
            .get(&TypeId::of::<T>())
-            .and_then(|boxed| boxed.downcast_ref())
+            .and_then(|boxed| (&**boxed as &(dyn Any + 'static)).downcast_ref())
    }

    /// Get a mutable reference to a type previously inserted on this `Extensions`.
    pub fn get_mut<T: 'static>(&mut self) -> Option<&mut T> {
        self.map
            .get_mut(&TypeId::of::<T>())
-            .and_then(|boxed| boxed.downcast_mut())
+            .and_then(|boxed| (&mut **boxed as &mut (dyn Any + 'static)).downcast_mut())
    }

    /// Remove a type from this `Extensions`.
    ///
    /// If a extension of this type existed, it will be returned.
    pub fn remove<T: 'static>(&mut self) -> Option<T> {
-        self.map
-            .remove(&TypeId::of::<T>())
-            .and_then(|boxed| boxed.downcast().ok().map(|boxed| *boxed))
+        self.map.remove(&TypeId::of::<T>()).and_then(|boxed| {
+            (boxed as Box<dyn Any + 'static>)
+                .downcast()
+                .ok()
+                .map(|boxed| *boxed)
+        })
    }

    /// Clear the `Extensions` of all inserted extensions.
@ -69,113 +70,22 @@ impl fmt::Debug for Extensions {
    }
 }

-#[cfg(test)]
-mod tests {
-    use super::*;
-    
-    #[test]
-    fn test_remove() {
-        let mut map = Extensions::new();
+#[test]
+fn test_extensions() {
+    #[derive(Debug, PartialEq)]
+    struct MyType(i32);

-        map.insert::<i8>(123);
-        assert!(map.get::<i8>().is_some());
+    let mut extensions = Extensions::new();

-        map.remove::<i8>();
-        assert!(map.get::<i8>().is_none());
-    }
+    extensions.insert(5i32);
+    extensions.insert(MyType(10));

-    #[test]
-    fn test_clear() {
-        let mut map = Extensions::new();
+    assert_eq!(extensions.get(), Some(&5i32));
+    assert_eq!(extensions.get_mut(), Some(&mut 5i32));

-        map.insert::<i8>(8);
-        map.insert::<i16>(16);
-        map.insert::<i32>(32);
+    assert_eq!(extensions.remove::<i32>(), Some(5i32));
+    assert!(extensions.get::<i32>().is_none());

-        assert!(map.contains::<i8>());
-        assert!(map.contains::<i16>());
-        assert!(map.contains::<i32>());
-
-        map.clear();
-
-        assert!(!map.contains::<i8>());
-        assert!(!map.contains::<i16>());
-        assert!(!map.contains::<i32>());
-
-        map.insert::<i8>(10);
-        assert_eq!(*map.get::<i8>().unwrap(), 10);
-    }
-
-    #[test]
-    fn test_integers() {
-        let mut map = Extensions::new();
-
-        map.insert::<i8>(8);
-        map.insert::<i16>(16);
-        map.insert::<i32>(32);
-        map.insert::<i64>(64);
-        map.insert::<i128>(128);
-        map.insert::<u8>(8);
-        map.insert::<u16>(16);
-        map.insert::<u32>(32);
-        map.insert::<u64>(64);
-        map.insert::<u128>(128);
-        assert!(map.get::<i8>().is_some());
-        assert!(map.get::<i16>().is_some());
-        assert!(map.get::<i32>().is_some());
-        assert!(map.get::<i64>().is_some());
-        assert!(map.get::<i128>().is_some());
-        assert!(map.get::<u8>().is_some());
-        assert!(map.get::<u16>().is_some());
-        assert!(map.get::<u32>().is_some());
-        assert!(map.get::<u64>().is_some());
-        assert!(map.get::<u128>().is_some());
-    }
-
-    #[test]
-    fn test_composition() {
-        struct Magi<T>(pub T);
-
-        struct Madoka {
-            pub god: bool,
-        }
-
-        struct Homura {
-            pub attempts: usize,
-        }
-
-        struct Mami {
-            pub guns: usize,
-        }
-
-        let mut map = Extensions::new();
-
-        map.insert(Magi(Madoka { god: false }));
-        map.insert(Magi(Homura { attempts: 0 }));
-        map.insert(Magi(Mami { guns: 999 }));
-
-        assert!(!map.get::<Magi<Madoka>>().unwrap().0.god);
-        assert_eq!(0, map.get::<Magi<Homura>>().unwrap().0.attempts);
-        assert_eq!(999, map.get::<Magi<Mami>>().unwrap().0.guns);
-    }
-
-    #[test]
-    fn test_extensions() {
-        #[derive(Debug, PartialEq)]
-        struct MyType(i32);
-
-        let mut extensions = Extensions::new();
-
-        extensions.insert(5i32);
-        extensions.insert(MyType(10));
-
-        assert_eq!(extensions.get(), Some(&5i32));
-        assert_eq!(extensions.get_mut(), Some(&mut 5i32));
-
-        assert_eq!(extensions.remove::<i32>(), Some(5i32));
-        assert!(extensions.get::<i32>().is_none());
-
-        assert_eq!(extensions.get::<bool>(), None);
-        assert_eq!(extensions.get(), Some(&MyType(10)));
-    }
+    assert_eq!(extensions.get::<bool>(), None);
+    assert_eq!(extensions.get(), Some(&MyType(10)));
 }
--- a/actix-http/src/h1/decoder.rs
+++ b/actix-http/src/h1/decoder.rs
@ -8,6 +8,7 @@ use actix_codec::Decoder;
 use bytes::{Buf, Bytes, BytesMut};
 use http::header::{HeaderName, HeaderValue};
 use http::{header, Method, StatusCode, Uri, Version};
+use httparse;
 use log::{debug, error, trace};

 use crate::error::ParseError;
@ -18,7 +19,7 @@ use crate::request::Request;
 const MAX_BUFFER_SIZE: usize = 131_072;
 const MAX_HEADERS: usize = 96;

-/// Incoming message decoder
+/// Incoming messagd decoder
 pub(crate) struct MessageDecoder<T: MessageType>(PhantomData<T>);

 #[derive(Debug)]
--- a/actix-http/src/h1/dispatcher.rs
+++ b/actix-http/src/h1/dispatcher.rs
@ -10,7 +10,6 @@ use actix_service::Service;
 use bitflags::bitflags;
 use bytes::{Buf, BytesMut};
 use log::{error, trace};
-use pin_project::pin_project;

 use crate::body::{Body, BodySize, MessageBody, ResponseBody};
 use crate::cloneable::CloneableService;
@ -42,7 +41,6 @@ bitflags! {
    }
 }

-#[pin_project::pin_project]
 /// Dispatcher for HTTP/1.1 protocol
 pub struct Dispatcher<T, S, B, X, U>
 where
@ -54,11 +52,9 @@ where
    U: Service<Request = (Request, Framed<T, Codec>), Response = ()>,
    U::Error: fmt::Display,
 {
-    #[pin]
    inner: DispatcherState<T, S, B, X, U>,
 }

-#[pin_project]
 enum DispatcherState<T, S, B, X, U>
 where
    S: Service<Request = Request>,
@ -69,11 +65,11 @@ where
    U: Service<Request = (Request, Framed<T, Codec>), Response = ()>,
    U::Error: fmt::Display,
 {
-    Normal(#[pin] InnerDispatcher<T, S, B, X, U>),
-    Upgrade(Pin<Box<U::Future>>),
+    Normal(InnerDispatcher<T, S, B, X, U>),
+    Upgrade(U::Future),
+    None,
 }

-#[pin_project]
 struct InnerDispatcher<T, S, B, X, U>
 where
    S: Service<Request = Request>,
@ -92,7 +88,6 @@ where
    peer_addr: Option<net::SocketAddr>,
    error: Option<DispatchError>,

-    #[pin]
    state: State<S, B, X>,
    payload: Option<PayloadSender>,
    messages: VecDeque<DispatcherMessage>,
@ -100,7 +95,7 @@ where
    ka_expire: Instant,
    ka_timer: Option<Delay>,

-    io: Option<T>,
+    io: T,
    read_buf: BytesMut,
    write_buf: BytesMut,
    codec: Codec,
@ -112,7 +107,6 @@ enum DispatcherMessage {
    Error(Response<()>),
 }

-#[pin_project]
 enum State<S, B, X>
 where
    S: Service<Request = Request>,
@ -120,9 +114,9 @@ where
    B: MessageBody,
 {
    None,
-    ExpectCall(Pin<Box<X::Future>>),
-    ServiceCall(Pin<Box<S::Future>>),
-    SendPayload(#[pin] ResponseBody<B>),
+    ExpectCall(X::Future),
+    ServiceCall(S::Future),
+    SendPayload(ResponseBody<B>),
 }

 impl<S, B, X> State<S, B, X>
@ -147,6 +141,7 @@ where
        }
    }
 }
+
 enum PollResponse {
    Upgrade(Request),
    DoNothing,
@ -241,7 +236,7 @@ where
                state: State::None,
                error: None,
                messages: VecDeque::new(),
-                io: Some(io),
+                io,
                codec,
                read_buf,
                service,
@ -283,35 +278,29 @@ where
    }

    // if checked is set to true, delay disconnect until all tasks have finished.
-    fn client_disconnected(self: Pin<&mut Self>) {
-        let this = self.project();
-        this.flags
+    fn client_disconnected(&mut self) {
+        self.flags
            .insert(Flags::READ_DISCONNECT | Flags::WRITE_DISCONNECT);
-        if let Some(mut payload) = this.payload.take() {
+        if let Some(mut payload) = self.payload.take() {
            payload.set_error(PayloadError::Incomplete(None));
        }
    }

    /// Flush stream
    ///
-    /// true - got WouldBlock
-    /// false - didn't get WouldBlock
-    #[pin_project::project]
-    fn poll_flush(
-        self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Result<bool, DispatchError> {
+    /// true - got whouldblock
+    /// false - didnt get whouldblock
+    fn poll_flush(&mut self, cx: &mut Context<'_>) -> Result<bool, DispatchError> {
        if self.write_buf.is_empty() {
            return Ok(false);
        }

        let len = self.write_buf.len();
        let mut written = 0;
-        #[project]
-        let InnerDispatcher { io, write_buf, .. } = self.project();
-        let mut io = Pin::new(io.as_mut().unwrap());
        while written < len {
-            match io.as_mut().poll_write(cx, &write_buf[written..]) {
+            match unsafe { Pin::new_unchecked(&mut self.io) }
+                .poll_write(cx, &self.write_buf[written..])
+            {
                Poll::Ready(Ok(0)) => {
                    return Err(DispatchError::Io(io::Error::new(
                        io::ErrorKind::WriteZero,
@ -323,119 +312,112 @@ where
                }
                Poll::Pending => {
                    if written > 0 {
-                        write_buf.advance(written);
+                        self.write_buf.advance(written);
                    }
                    return Ok(true);
                }
                Poll::Ready(Err(err)) => return Err(DispatchError::Io(err)),
            }
        }
-        if written == write_buf.len() {
-            unsafe { write_buf.set_len(0) }
+        if written == self.write_buf.len() {
+            unsafe { self.write_buf.set_len(0) }
        } else {
-            write_buf.advance(written);
+            self.write_buf.advance(written);
        }
        Ok(false)
    }

    fn send_response(
-        self: Pin<&mut Self>,
+        &mut self,
        message: Response<()>,
        body: ResponseBody<B>,
    ) -> Result<State<S, B, X>, DispatchError> {
-        let mut this = self.project();
-        this.codec
-            .encode(Message::Item((message, body.size())), &mut this.write_buf)
+        self.codec
+            .encode(Message::Item((message, body.size())), &mut self.write_buf)
            .map_err(|err| {
-                if let Some(mut payload) = this.payload.take() {
+                if let Some(mut payload) = self.payload.take() {
                    payload.set_error(PayloadError::Incomplete(None));
                }
                DispatchError::Io(err)
            })?;

-        this.flags.set(Flags::KEEPALIVE, this.codec.keepalive());
+        self.flags.set(Flags::KEEPALIVE, self.codec.keepalive());
        match body.size() {
            BodySize::None | BodySize::Empty => Ok(State::None),
            _ => Ok(State::SendPayload(body)),
        }
    }

-    fn send_continue(self: Pin<&mut Self>) {
-        self.project()
-            .write_buf
+    fn send_continue(&mut self) {
+        self.write_buf
            .extend_from_slice(b"HTTP/1.1 100 Continue\r\n\r\n");
    }

-    #[pin_project::project]
    fn poll_response(
-        mut self: Pin<&mut Self>,
+        &mut self,
        cx: &mut Context<'_>,
    ) -> Result<PollResponse, DispatchError> {
        loop {
-            let mut this = self.as_mut().project();
-            #[project]
-            let state = match this.state.project() {
-                State::None => match this.messages.pop_front() {
+            let state = match self.state {
+                State::None => match self.messages.pop_front() {
                    Some(DispatcherMessage::Item(req)) => {
-                        Some(self.as_mut().handle_request(req, cx)?)
+                        Some(self.handle_request(req, cx)?)
+                    }
+                    Some(DispatcherMessage::Error(res)) => {
+                        Some(self.send_response(res, ResponseBody::Other(Body::Empty))?)
                    }
-                    Some(DispatcherMessage::Error(res)) => Some(
-                        self.as_mut()
-                            .send_response(res, ResponseBody::Other(Body::Empty))?,
-                    ),
                    Some(DispatcherMessage::Upgrade(req)) => {
                        return Ok(PollResponse::Upgrade(req));
                    }
                    None => None,
                },
-                State::ExpectCall(fut) => match fut.as_mut().poll(cx) {
-                    Poll::Ready(Ok(req)) => {
-                        self.as_mut().send_continue();
-                        this = self.as_mut().project();
-                        this.state
-                            .set(State::ServiceCall(Box::pin(this.service.call(req))));
-                        continue;
+                State::ExpectCall(ref mut fut) => {
+                    match unsafe { Pin::new_unchecked(fut) }.poll(cx) {
+                        Poll::Ready(Ok(req)) => {
+                            self.send_continue();
+                            self.state = State::ServiceCall(self.service.call(req));
+                            continue;
+                        }
+                        Poll::Ready(Err(e)) => {
+                            let res: Response = e.into().into();
+                            let (res, body) = res.replace_body(());
+                            Some(self.send_response(res, body.into_body())?)
+                        }
+                        Poll::Pending => None,
                    }
-                    Poll::Ready(Err(e)) => {
-                        let res: Response = e.into().into();
-                        let (res, body) = res.replace_body(());
-                        Some(self.as_mut().send_response(res, body.into_body())?)
+                }
+                State::ServiceCall(ref mut fut) => {
+                    match unsafe { Pin::new_unchecked(fut) }.poll(cx) {
+                        Poll::Ready(Ok(res)) => {
+                            let (res, body) = res.into().replace_body(());
+                            self.state = self.send_response(res, body)?;
+                            continue;
+                        }
+                        Poll::Ready(Err(e)) => {
+                            let res: Response = e.into().into();
+                            let (res, body) = res.replace_body(());
+                            Some(self.send_response(res, body.into_body())?)
+                        }
+                        Poll::Pending => None,
                    }
-                    Poll::Pending => None,
-                },
-                State::ServiceCall(fut) => match fut.as_mut().poll(cx) {
-                    Poll::Ready(Ok(res)) => {
-                        let (res, body) = res.into().replace_body(());
-                        let state = self.as_mut().send_response(res, body)?;
-                        this = self.as_mut().project();
-                        this.state.set(state);
-                        continue;
-                    }
-                    Poll::Ready(Err(e)) => {
-                        let res: Response = e.into().into();
-                        let (res, body) = res.replace_body(());
-                        Some(self.as_mut().send_response(res, body.into_body())?)
-                    }
-                    Poll::Pending => None,
-                },
-                State::SendPayload(mut stream) => {
+                }
+                State::SendPayload(ref mut stream) => {
                    loop {
-                        if this.write_buf.len() < HW_BUFFER_SIZE {
-                            match stream.as_mut().poll_next(cx) {
+                        if self.write_buf.len() < HW_BUFFER_SIZE {
+                            match stream.poll_next(cx) {
                                Poll::Ready(Some(Ok(item))) => {
-                                    this.codec.encode(
+                                    self.codec.encode(
                                        Message::Chunk(Some(item)),
-                                        &mut this.write_buf,
+                                        &mut self.write_buf,
                                    )?;
                                    continue;
                                }
                                Poll::Ready(None) => {
-                                    this.codec.encode(
+                                    self.codec.encode(
                                        Message::Chunk(None),
-                                        &mut this.write_buf,
+                                        &mut self.write_buf,
                                    )?;
-                                    this = self.as_mut().project();
-                                    this.state.set(State::None);
+                                    self.state = State::None;
                                }
                                Poll::Ready(Some(Err(_))) => {
                                    return Err(DispatchError::Unknown)
@ -451,11 +433,9 @@ where
                }
            };

-            this = self.as_mut().project();
-
            // set new state
            if let Some(state) = state {
-                this.state.set(state);
+                self.state = state;
                if !self.state.is_empty() {
                    continue;
                }
@ -463,7 +443,7 @@ where
                // if read-backpressure is enabled and we consumed some data.
                // we may read more data and retry
                if self.state.is_call() {
-                    if self.as_mut().poll_request(cx)? {
+                    if self.poll_request(cx)? {
                        continue;
                    }
                } else if !self.messages.is_empty() {
@ -477,16 +457,16 @@ where
    }

    fn handle_request(
-        mut self: Pin<&mut Self>,
+        &mut self,
        req: Request,
        cx: &mut Context<'_>,
    ) -> Result<State<S, B, X>, DispatchError> {
        // Handle `EXPECT: 100-Continue` header
        let req = if req.head().expect() {
-            let mut task = Box::pin(self.as_mut().project().expect.call(req));
-            match task.as_mut().poll(cx) {
+            let mut task = self.expect.call(req);
+            match unsafe { Pin::new_unchecked(&mut task) }.poll(cx) {
                Poll::Ready(Ok(req)) => {
-                    self.as_mut().send_continue();
+                    self.send_continue();
                    req
                }
                Poll::Pending => return Ok(State::ExpectCall(task)),
@ -502,8 +482,8 @@ where
        };

        // Call service
-        let mut task = Box::pin(self.as_mut().project().service.call(req));
-        match task.as_mut().poll(cx) {
+        let mut task = self.service.call(req);
+        match unsafe { Pin::new_unchecked(&mut task) }.poll(cx) {
            Poll::Ready(Ok(res)) => {
                let (res, body) = res.into().replace_body(());
                self.send_response(res, body)
@ -519,7 +499,7 @@ where

    /// Process one incoming requests
    pub(self) fn poll_request(
-        mut self: Pin<&mut Self>,
+        &mut self,
        cx: &mut Context<'_>,
    ) -> Result<bool, DispatchError> {
        // limit a mount of non processed requests
@ -528,25 +508,24 @@ where
        }

        let mut updated = false;
-        let mut this = self.as_mut().project();
        loop {
-            match this.codec.decode(&mut this.read_buf) {
+            match self.codec.decode(&mut self.read_buf) {
                Ok(Some(msg)) => {
                    updated = true;
-                    this.flags.insert(Flags::STARTED);
+                    self.flags.insert(Flags::STARTED);

                    match msg {
                        Message::Item(mut req) => {
-                            let pl = this.codec.message_type();
-                            req.head_mut().peer_addr = *this.peer_addr;
+                            let pl = self.codec.message_type();
+                            req.head_mut().peer_addr = self.peer_addr;

                            // set on_connect data
-                            if let Some(ref on_connect) = this.on_connect {
+                            if let Some(ref on_connect) = self.on_connect {
                                on_connect.set(&mut req.extensions_mut());
                            }

-                            if pl == MessageType::Stream && this.upgrade.is_some() {
-                                this.messages.push_back(DispatcherMessage::Upgrade(req));
+                            if pl == MessageType::Stream && self.upgrade.is_some() {
+                                self.messages.push_back(DispatcherMessage::Upgrade(req));
                                break;
                            }
                            if pl == MessageType::Payload || pl == MessageType::Stream {
@ -554,43 +533,41 @@ where
                                let (req1, _) =
                                    req.replace_payload(crate::Payload::H1(pl));
                                req = req1;
-                                *this.payload = Some(ps);
+                                self.payload = Some(ps);
                            }

                            // handle request early
-                            if this.state.is_empty() {
-                                let state = self.as_mut().handle_request(req, cx)?;
-                                this = self.as_mut().project();
-                                this.state.set(state);
+                            if self.state.is_empty() {
+                                self.state = self.handle_request(req, cx)?;
                            } else {
-                                this.messages.push_back(DispatcherMessage::Item(req));
+                                self.messages.push_back(DispatcherMessage::Item(req));
                            }
                        }
                        Message::Chunk(Some(chunk)) => {
-                            if let Some(ref mut payload) = this.payload {
+                            if let Some(ref mut payload) = self.payload {
                                payload.feed_data(chunk);
                            } else {
                                error!(
                                    "Internal server error: unexpected payload chunk"
                                );
-                                this.flags.insert(Flags::READ_DISCONNECT);
-                                this.messages.push_back(DispatcherMessage::Error(
+                                self.flags.insert(Flags::READ_DISCONNECT);
+                                self.messages.push_back(DispatcherMessage::Error(
                                    Response::InternalServerError().finish().drop_body(),
                                ));
-                                *this.error = Some(DispatchError::InternalError);
+                                self.error = Some(DispatchError::InternalError);
                                break;
                            }
                        }
                        Message::Chunk(None) => {
-                            if let Some(mut payload) = this.payload.take() {
+                            if let Some(mut payload) = self.payload.take() {
                                payload.feed_eof();
                            } else {
                                error!("Internal server error: unexpected eof");
-                                this.flags.insert(Flags::READ_DISCONNECT);
-                                this.messages.push_back(DispatcherMessage::Error(
+                                self.flags.insert(Flags::READ_DISCONNECT);
+                                self.messages.push_back(DispatcherMessage::Error(
                                    Response::InternalServerError().finish().drop_body(),
                                ));
-                                *this.error = Some(DispatchError::InternalError);
+                                self.error = Some(DispatchError::InternalError);
                                break;
                            }
                        }
@ -598,49 +575,44 @@ where
                }
                Ok(None) => break,
                Err(ParseError::Io(e)) => {
-                    self.as_mut().client_disconnected();
-                    this = self.as_mut().project();
-                    *this.error = Some(DispatchError::Io(e));
+                    self.client_disconnected();
+                    self.error = Some(DispatchError::Io(e));
                    break;
                }
                Err(e) => {
-                    if let Some(mut payload) = this.payload.take() {
+                    if let Some(mut payload) = self.payload.take() {
                        payload.set_error(PayloadError::EncodingCorrupted);
                    }

                    // Malformed requests should be responded with 400
-                    this.messages.push_back(DispatcherMessage::Error(
+                    self.messages.push_back(DispatcherMessage::Error(
                        Response::BadRequest().finish().drop_body(),
                    ));
-                    this.flags.insert(Flags::READ_DISCONNECT);
-                    *this.error = Some(e.into());
+                    self.flags.insert(Flags::READ_DISCONNECT);
+                    self.error = Some(e.into());
                    break;
                }
            }
        }

-        if updated && this.ka_timer.is_some() {
-            if let Some(expire) = this.codec.config().keep_alive_expire() {
-                *this.ka_expire = expire;
+        if updated && self.ka_timer.is_some() {
+            if let Some(expire) = self.codec.config().keep_alive_expire() {
+                self.ka_expire = expire;
            }
        }
        Ok(updated)
    }

    /// keep-alive timer
-    fn poll_keepalive(
-        mut self: Pin<&mut Self>,
-        cx: &mut Context<'_>,
-    ) -> Result<(), DispatchError> {
-        let mut this = self.as_mut().project();
-        if this.ka_timer.is_none() {
+    fn poll_keepalive(&mut self, cx: &mut Context<'_>) -> Result<(), DispatchError> {
+        if self.ka_timer.is_none() {
            // shutdown timeout
-            if this.flags.contains(Flags::SHUTDOWN) {
-                if let Some(interval) = this.codec.config().client_disconnect_timer() {
-                    *this.ka_timer = Some(delay_until(interval));
+            if self.flags.contains(Flags::SHUTDOWN) {
+                if let Some(interval) = self.codec.config().client_disconnect_timer() {
+                    self.ka_timer = Some(delay_until(interval));
                } else {
-                    this.flags.insert(Flags::READ_DISCONNECT);
-                    if let Some(mut payload) = this.payload.take() {
+                    self.flags.insert(Flags::READ_DISCONNECT);
+                    if let Some(mut payload) = self.payload.take() {
                        payload.set_error(PayloadError::Incomplete(None));
                    }
                    return Ok(());
@ -650,56 +622,55 @@ where
            }
        }

-        match Pin::new(&mut this.ka_timer.as_mut().unwrap()).poll(cx) {
+        match Pin::new(&mut self.ka_timer.as_mut().unwrap()).poll(cx) {
            Poll::Ready(()) => {
                // if we get timeout during shutdown, drop connection
-                if this.flags.contains(Flags::SHUTDOWN) {
+                if self.flags.contains(Flags::SHUTDOWN) {
                    return Err(DispatchError::DisconnectTimeout);
-                } else if this.ka_timer.as_mut().unwrap().deadline() >= *this.ka_expire {
+                } else if self.ka_timer.as_mut().unwrap().deadline() >= self.ka_expire {
                    // check for any outstanding tasks
-                    if this.state.is_empty() && this.write_buf.is_empty() {
-                        if this.flags.contains(Flags::STARTED) {
+                    if self.state.is_empty() && self.write_buf.is_empty() {
+                        if self.flags.contains(Flags::STARTED) {
                            trace!("Keep-alive timeout, close connection");
-                            this.flags.insert(Flags::SHUTDOWN);
+                            self.flags.insert(Flags::SHUTDOWN);

                            // start shutdown timer
                            if let Some(deadline) =
-                                this.codec.config().client_disconnect_timer()
+                                self.codec.config().client_disconnect_timer()
                            {
-                                if let Some(mut timer) = this.ka_timer.as_mut() {
+                                if let Some(mut timer) = self.ka_timer.as_mut() {
                                    timer.reset(deadline);
                                    let _ = Pin::new(&mut timer).poll(cx);
                                }
                            } else {
                                // no shutdown timeout, drop socket
-                                this.flags.insert(Flags::WRITE_DISCONNECT);
+                                self.flags.insert(Flags::WRITE_DISCONNECT);
                                return Ok(());
                            }
                        } else {
                            // timeout on first request (slow request) return 408
-                            if !this.flags.contains(Flags::STARTED) {
+                            if !self.flags.contains(Flags::STARTED) {
                                trace!("Slow request timeout");
-                                let _ = self.as_mut().send_response(
+                                let _ = self.send_response(
                                    Response::RequestTimeout().finish().drop_body(),
                                    ResponseBody::Other(Body::Empty),
                                );
-                                this = self.as_mut().project();
                            } else {
                                trace!("Keep-alive connection timeout");
                            }
-                            this.flags.insert(Flags::STARTED | Flags::SHUTDOWN);
-                            this.state.set(State::None);
+                            self.flags.insert(Flags::STARTED | Flags::SHUTDOWN);
+                            self.state = State::None;
                        }
                    } else if let Some(deadline) =
-                        this.codec.config().keep_alive_expire()
+                        self.codec.config().keep_alive_expire()
                    {
-                        if let Some(mut timer) = this.ka_timer.as_mut() {
+                        if let Some(mut timer) = self.ka_timer.as_mut() {
                            timer.reset(deadline);
                            let _ = Pin::new(&mut timer).poll(cx);
                        }
                    }
-                } else if let Some(mut timer) = this.ka_timer.as_mut() {
-                    timer.reset(*this.ka_expire);
+                } else if let Some(mut timer) = self.ka_timer.as_mut() {
+                    timer.reset(self.ka_expire);
                    let _ = Pin::new(&mut timer).poll(cx);
                }
            }
@ -710,6 +681,20 @@ where
    }
 }

+impl<T, S, B, X, U> Unpin for Dispatcher<T, S, B, X, U>
+where
+    T: AsyncRead + AsyncWrite + Unpin,
+    S: Service<Request = Request>,
+    S::Error: Into<Error>,
+    S::Response: Into<Response<B>>,
+    B: MessageBody,
+    X: Service<Request = Request, Response = Request>,
+    X::Error: Into<Error>,
+    U: Service<Request = (Request, Framed<T, Codec>), Response = ()>,
+    U::Error: fmt::Display,
+{
+}
+
 impl<T, S, B, X, U> Future for Dispatcher<T, S, B, X, U>
 where
    T: AsyncRead + AsyncWrite + Unpin,
@ -724,29 +709,22 @@ where
 {
    type Output = Result<(), DispatchError>;

-    #[pin_project::project]
    #[inline]
    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let this = self.as_mut().project();
-        #[project]
-        match this.inner.project() {
-            DispatcherState::Normal(mut inner) => {
-                inner.as_mut().poll_keepalive(cx)?;
+        match self.as_mut().inner {
+            DispatcherState::Normal(ref mut inner) => {
+                inner.poll_keepalive(cx)?;

                if inner.flags.contains(Flags::SHUTDOWN) {
                    if inner.flags.contains(Flags::WRITE_DISCONNECT) {
                        Poll::Ready(Ok(()))
                    } else {
                        // flush buffer
-                        inner.as_mut().poll_flush(cx)?;
-                        if !inner.write_buf.is_empty() || inner.io.is_none() {
+                        inner.poll_flush(cx)?;
+                        if !inner.write_buf.is_empty() {
                            Poll::Pending
                        } else {
-                            match Pin::new(inner.project().io)
-                                .as_pin_mut()
-                                .unwrap()
-                                .poll_shutdown(cx)
-                            {
+                            match Pin::new(&mut inner.io).poll_shutdown(cx) {
                                Poll::Ready(res) => {
                                    Poll::Ready(res.map_err(DispatchError::from))
                                }
@ -758,58 +736,53 @@ where
                    // read socket into a buf
                    let should_disconnect =
                        if !inner.flags.contains(Flags::READ_DISCONNECT) {
-                            let mut inner_p = inner.as_mut().project();
-                            read_available(
-                                cx,
-                                inner_p.io.as_mut().unwrap(),
-                                &mut inner_p.read_buf,
-                            )?
+                            read_available(cx, &mut inner.io, &mut inner.read_buf)?
                        } else {
                            None
                        };

-                    inner.as_mut().poll_request(cx)?;
+                    inner.poll_request(cx)?;
                    if let Some(true) = should_disconnect {
-                        let inner_p = inner.as_mut().project();
-                        inner_p.flags.insert(Flags::READ_DISCONNECT);
-                        if let Some(mut payload) = inner_p.payload.take() {
+                        inner.flags.insert(Flags::READ_DISCONNECT);
+                        if let Some(mut payload) = inner.payload.take() {
                            payload.feed_eof();
                        }
                    };

                    loop {
-                        let inner_p = inner.as_mut().project();
                        let remaining =
-                            inner_p.write_buf.capacity() - inner_p.write_buf.len();
+                            inner.write_buf.capacity() - inner.write_buf.len();
                        if remaining < LW_BUFFER_SIZE {
-                            inner_p.write_buf.reserve(HW_BUFFER_SIZE - remaining);
+                            inner.write_buf.reserve(HW_BUFFER_SIZE - remaining);
                        }
-                        let result = inner.as_mut().poll_response(cx)?;
+                        let result = inner.poll_response(cx)?;
                        let drain = result == PollResponse::DrainWriteBuf;

                        // switch to upgrade handler
                        if let PollResponse::Upgrade(req) = result {
-                            let inner_p = inner.as_mut().project();
-                            let mut parts = FramedParts::with_read_buf(
-                                inner_p.io.take().unwrap(),
-                                std::mem::take(inner_p.codec),
-                                std::mem::take(inner_p.read_buf),
-                            );
-                            parts.write_buf = std::mem::take(inner_p.write_buf);
-                            let framed = Framed::from_parts(parts);
-                            let upgrade =
-                                inner_p.upgrade.take().unwrap().call((req, framed));
-                            self.as_mut()
-                                .project()
-                                .inner
-                                .set(DispatcherState::Upgrade(Box::pin(upgrade)));
-                            return self.poll(cx);
+                            if let DispatcherState::Normal(inner) =
+                                std::mem::replace(&mut self.inner, DispatcherState::None)
+                            {
+                                let mut parts = FramedParts::with_read_buf(
+                                    inner.io,
+                                    inner.codec,
+                                    inner.read_buf,
+                                );
+                                parts.write_buf = inner.write_buf;
+                                let framed = Framed::from_parts(parts);
+                                self.inner = DispatcherState::Upgrade(
+                                    inner.upgrade.unwrap().call((req, framed)),
+                                );
+                                return self.poll(cx);
+                            } else {
+                                panic!()
+                            }
                        }

-                        // we didn't get WouldBlock from write operation,
+                        // we didnt get WouldBlock from write operation,
                        // so data get written to kernel completely (OSX)
                        // and we have to write again otherwise response can get stuck
-                        if inner.as_mut().poll_flush(cx)? || !drain {
+                        if inner.poll_flush(cx)? || !drain {
                            break;
                        }
                    }
@ -821,26 +794,25 @@ where

                    let is_empty = inner.state.is_empty();

-                    let inner_p = inner.as_mut().project();
                    // read half is closed and we do not processing any responses
-                    if inner_p.flags.contains(Flags::READ_DISCONNECT) && is_empty {
-                        inner_p.flags.insert(Flags::SHUTDOWN);
+                    if inner.flags.contains(Flags::READ_DISCONNECT) && is_empty {
+                        inner.flags.insert(Flags::SHUTDOWN);
                    }

                    // keep-alive and stream errors
-                    if is_empty && inner_p.write_buf.is_empty() {
-                        if let Some(err) = inner_p.error.take() {
+                    if is_empty && inner.write_buf.is_empty() {
+                        if let Some(err) = inner.error.take() {
                            Poll::Ready(Err(err))
                        }
                        // disconnect if keep-alive is not enabled
-                        else if inner_p.flags.contains(Flags::STARTED)
-                            && !inner_p.flags.intersects(Flags::KEEPALIVE)
+                        else if inner.flags.contains(Flags::STARTED)
+                            && !inner.flags.intersects(Flags::KEEPALIVE)
                        {
-                            inner_p.flags.insert(Flags::SHUTDOWN);
+                            inner.flags.insert(Flags::SHUTDOWN);
                            self.poll(cx)
                        }
                        // disconnect if shutdown
-                        else if inner_p.flags.contains(Flags::SHUTDOWN) {
+                        else if inner.flags.contains(Flags::SHUTDOWN) {
                            self.poll(cx)
                        } else {
                            Poll::Pending
@ -850,10 +822,13 @@ where
                    }
                }
            }
-            DispatcherState::Upgrade(fut) => fut.as_mut().poll(cx).map_err(|e| {
-                error!("Upgrade handler error: {}", e);
-                DispatchError::Upgrade
-            }),
+            DispatcherState::Upgrade(ref mut fut) => {
+                unsafe { Pin::new_unchecked(fut) }.poll(cx).map_err(|e| {
+                    error!("Upgrade handler error: {}", e);
+                    DispatchError::Upgrade
+                })
+            }
+            DispatcherState::None => panic!(),
        }
    }
 }
@ -943,12 +918,9 @@ mod tests {
                Poll::Ready(res) => assert!(res.is_err()),
            }

-            if let DispatcherState::Normal(ref mut inner) = h1.inner {
+            if let DispatcherState::Normal(ref inner) = h1.inner {
                assert!(inner.flags.contains(Flags::READ_DISCONNECT));
-                assert_eq!(
-                    &inner.io.take().unwrap().write_buf[..26],
-                    b"HTTP/1.1 400 Bad Request\r\n"
-                );
+                assert_eq!(&inner.io.write_buf[..26], b"HTTP/1.1 400 Bad Request\r\n");
            }
        })
        .await;
--- a/actix-http/src/h1/encoder.rs
+++ b/actix-http/src/h1/encoder.rs
@ -4,7 +4,7 @@ use std::ptr::copy_nonoverlapping;
 use std::slice::from_raw_parts_mut;
 use std::{cmp, io};

-use bytes::{BufMut, BytesMut};
+use bytes::{buf::BufMutExt, BufMut, BytesMut};

 use crate::body::BodySize;
 use crate::config::ServiceConfig;
@ -95,6 +95,15 @@ pub(crate) trait MessageType: Sized {
                }
            }
            BodySize::Sized(len) => helpers::write_content_length(len, dst),
+            BodySize::Sized64(len) => {
+                if camel_case {
+                    dst.put_slice(b"\r\nContent-Length: ");
+                } else {
+                    dst.put_slice(b"\r\ncontent-length: ");
+                }
+                #[allow(clippy::write_with_newline)]
+                write!(dst.writer(), "{}\r\n", len)?;
+            }
            BodySize::None => dst.put_slice(b"\r\n"),
        }

@ -329,7 +338,8 @@ impl<T: MessageType> MessageEncoder<T> {
        if !head {
            self.te = match length {
                BodySize::Empty => TransferEncoding::empty(),
-                BodySize::Sized(len) => TransferEncoding::length(len),
+                BodySize::Sized(len) => TransferEncoding::length(len as u64),
+                BodySize::Sized64(len) => TransferEncoding::length(len),
                BodySize::Stream => {
                    if message.chunked() && !stream {
                        TransferEncoding::chunked()
@ -572,6 +582,19 @@ mod tests {
        assert!(data.contains("Content-Type: plain/text\r\n"));
        assert!(data.contains("Date: date\r\n"));

+        let _ = head.encode_headers(
+            &mut bytes,
+            Version::HTTP_11,
+            BodySize::Sized64(100),
+            ConnectionType::KeepAlive,
+            &ServiceConfig::default(),
+        );
+        let data =
+            String::from_utf8(Vec::from(bytes.split().freeze().as_ref())).unwrap();
+        assert!(data.contains("Content-Length: 100\r\n"));
+        assert!(data.contains("Content-Type: plain/text\r\n"));
+        assert!(data.contains("Date: date\r\n"));
+
        let mut head = RequestHead::default();
        head.set_camel_case_headers(false);
        head.headers.insert(DATE, HeaderValue::from_static("date"));
--- a/actix-http/src/h1/utils.rs
+++ b/actix-http/src/h1/utils.rs
@ -13,7 +13,6 @@ use crate::response::Response;
 #[pin_project::pin_project]
 pub struct SendResponse<T, B> {
    res: Option<Message<(Response<()>, BodySize)>>,
-    #[pin]
    body: Option<ResponseBody<B>>,
    framed: Option<Framed<T, Codec>>,
 }
@ -36,27 +35,24 @@ where
 impl<T, B> Future for SendResponse<T, B>
 where
    T: AsyncRead + AsyncWrite,
-    B: MessageBody + Unpin,
+    B: MessageBody,
 {
    type Output = Result<Framed<T, Codec>, Error>;

-    // TODO: rethink if we need loops in polls
    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut this = self.project();
+        let this = self.get_mut();

-        let mut body_done = this.body.is_none();
        loop {
-            let mut body_ready = !body_done;
+            let mut body_ready = this.body.is_some();
            let framed = this.framed.as_mut().unwrap();

            // send body
-            if this.res.is_none() && body_ready {
-                while body_ready && !body_done && !framed.is_write_buf_full() {
-                    match this.body.as_mut().as_pin_mut().unwrap().poll_next(cx)? {
+            if this.res.is_none() && this.body.is_some() {
+                while body_ready && this.body.is_some() && !framed.is_write_buf_full() {
+                    match this.body.as_mut().unwrap().poll_next(cx)? {
                        Poll::Ready(item) => {
-                            // body is done when item is None
-                            body_done = item.is_none();
-                            if body_done {
+                            // body is done
+                            if item.is_none() {
                                let _ = this.body.take();
                            }
                            framed.write(Message::Chunk(item))?;
@ -86,7 +82,7 @@ where
                continue;
            }

-            if !body_done {
+            if this.body.is_some() {
                if body_ready {
                    continue;
                } else {
--- a/actix-http/src/h2/dispatcher.rs
+++ b/actix-http/src/h2/dispatcher.rs
@ -158,17 +158,15 @@ where

 #[pin_project::pin_project]
 struct ServiceResponse<F, I, E, B> {
-    #[pin]
    state: ServiceResponseState<F, B>,
    config: ServiceConfig,
    buffer: Option<Bytes>,
    _t: PhantomData<(I, E)>,
 }

-#[pin_project::pin_project]
 enum ServiceResponseState<F, B> {
-    ServiceCall(#[pin] F, Option<SendResponse<Bytes>>),
-    SendPayload(SendStream<Bytes>, #[pin] ResponseBody<B>),
+    ServiceCall(F, Option<SendResponse<Bytes>>),
+    SendPayload(SendStream<Bytes>, ResponseBody<B>),
 }

 impl<F, I, E, B> ServiceResponse<F, I, E, B>
@ -210,6 +208,10 @@ where
                CONTENT_LENGTH,
                HeaderValue::try_from(format!("{}", len)).unwrap(),
            ),
+            BodySize::Sized64(len) => res.headers_mut().insert(
+                CONTENT_LENGTH,
+                HeaderValue::try_from(format!("{}", len)).unwrap(),
+            ),
        };

        // copy headers
@ -245,66 +247,68 @@ where
 {
    type Output = ();

-    #[pin_project::project]
    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
        let mut this = self.as_mut().project();

-        #[project]
-        match this.state.project() {
-            ServiceResponseState::ServiceCall(call, send) => match call.poll(cx) {
-                Poll::Ready(Ok(res)) => {
-                    let (res, body) = res.into().replace_body(());
+        match this.state {
+            ServiceResponseState::ServiceCall(ref mut call, ref mut send) => {
+                match unsafe { Pin::new_unchecked(call) }.poll(cx) {
+                    Poll::Ready(Ok(res)) => {
+                        let (res, body) = res.into().replace_body(());

-                    let mut send = send.take().unwrap();
-                    let mut size = body.size();
-                    let h2_res = self.as_mut().prepare_response(res.head(), &mut size);
-                    this = self.as_mut().project();
+                        let mut send = send.take().unwrap();
+                        let mut size = body.size();
+                        let h2_res =
+                            self.as_mut().prepare_response(res.head(), &mut size);
+                        this = self.as_mut().project();

-                    let stream = match send.send_response(h2_res, size.is_eof()) {
-                        Err(e) => {
-                            trace!("Error sending h2 response: {:?}", e);
-                            return Poll::Ready(());
+                        let stream = match send.send_response(h2_res, size.is_eof()) {
+                            Err(e) => {
+                                trace!("Error sending h2 response: {:?}", e);
+                                return Poll::Ready(());
+                            }
+                            Ok(stream) => stream,
+                        };
+
+                        if size.is_eof() {
+                            Poll::Ready(())
+                        } else {
+                            *this.state =
+                                ServiceResponseState::SendPayload(stream, body);
+                            self.poll(cx)
                        }
-                        Ok(stream) => stream,
-                    };
+                    }
+                    Poll::Pending => Poll::Pending,
+                    Poll::Ready(Err(e)) => {
+                        let res: Response = e.into().into();
+                        let (res, body) = res.replace_body(());

-                    if size.is_eof() {
-                        Poll::Ready(())
-                    } else {
-                        this.state
-                            .set(ServiceResponseState::SendPayload(stream, body));
-                        self.poll(cx)
+                        let mut send = send.take().unwrap();
+                        let mut size = body.size();
+                        let h2_res =
+                            self.as_mut().prepare_response(res.head(), &mut size);
+                        this = self.as_mut().project();
+
+                        let stream = match send.send_response(h2_res, size.is_eof()) {
+                            Err(e) => {
+                                trace!("Error sending h2 response: {:?}", e);
+                                return Poll::Ready(());
+                            }
+                            Ok(stream) => stream,
+                        };
+
+                        if size.is_eof() {
+                            Poll::Ready(())
+                        } else {
+                            *this.state = ServiceResponseState::SendPayload(
+                                stream,
+                                body.into_body(),
+                            );
+                            self.poll(cx)
+                        }
                    }
                }
-                Poll::Pending => Poll::Pending,
-                Poll::Ready(Err(e)) => {
-                    let res: Response = e.into().into();
-                    let (res, body) = res.replace_body(());
-
-                    let mut send = send.take().unwrap();
-                    let mut size = body.size();
-                    let h2_res = self.as_mut().prepare_response(res.head(), &mut size);
-                    this = self.as_mut().project();
-
-                    let stream = match send.send_response(h2_res, size.is_eof()) {
-                        Err(e) => {
-                            trace!("Error sending h2 response: {:?}", e);
-                            return Poll::Ready(());
-                        }
-                        Ok(stream) => stream,
-                    };
-
-                    if size.is_eof() {
-                        Poll::Ready(())
-                    } else {
-                        this.state.set(ServiceResponseState::SendPayload(
-                            stream,
-                            body.into_body(),
-                        ));
-                        self.poll(cx)
-                    }
-                }
-            },
+            }
            ServiceResponseState::SendPayload(ref mut stream, ref mut body) => loop {
                loop {
                    if let Some(ref mut buffer) = this.buffer {
@ -331,7 +335,7 @@ where
                            }
                        }
                    } else {
-                        match body.as_mut().poll_next(cx) {
+                        match body.poll_next(cx) {
                            Poll::Pending => return Poll::Pending,
                            Poll::Ready(None) => {
                                if let Err(e) = stream.send_data(Bytes::new(), true) {
--- a/actix-http/src/h2/service.rs
+++ b/actix-http/src/h2/service.rs
@ -83,11 +83,13 @@ where
        Error = DispatchError,
        InitError = S::InitError,
    > {
-        pipeline_factory(fn_factory(|| async {
-            Ok::<_, S::InitError>(fn_service(|io: TcpStream| {
-                let peer_addr = io.peer_addr().ok();
-                ok::<_, DispatchError>((io, peer_addr))
-            }))
+        pipeline_factory(fn_factory(|| {
+            async {
+                Ok::<_, S::InitError>(fn_service(|io: TcpStream| {
+                    let peer_addr = io.peer_addr().ok();
+                    ok::<_, DispatchError>((io, peer_addr))
+                }))
+            }
        }))
        .and_then(self)
    }
--- a/actix-http/src/header/common/accept_charset.rs
+++ b/actix-http/src/header/common/accept_charset.rs
@ -63,7 +63,7 @@ header! {
    (AcceptCharset, ACCEPT_CHARSET) => (QualityItem<Charset>)+

    test_accept_charset {
-        // Test case from RFC
+        /// Test case from RFC
        test_header!(test1, vec![b"iso-8859-5, unicode-1-1;q=0.8"]);
    }
 }
--- a/actix-http/src/header/common/content_disposition.rs
+++ b/actix-http/src/header/common/content_disposition.rs
@ -90,40 +90,40 @@ pub enum DispositionParam {
    /// [RFC6266](https://tools.ietf.org/html/rfc6266) as *token "=" value*. Recipients should
    /// ignore unrecognizable parameters.
    Unknown(String, String),
-    /// An unrecognized extended parameter as defined in
+    /// An unrecognized extended paramater as defined in
    /// [RFC5987](https://tools.ietf.org/html/rfc5987) as *ext-parameter*, in
    /// [RFC6266](https://tools.ietf.org/html/rfc6266) as *ext-token "=" ext-value*. The single
-    /// trailing asterisk is not included. Recipients should ignore unrecognizable parameters.
+    /// trailling asterisk is not included. Recipients should ignore unrecognizable parameters.
    UnknownExt(String, ExtendedValue),
 }

 impl DispositionParam {
-    /// Returns `true` if the parameter is [`Name`](DispositionParam::Name).
+    /// Returns `true` if the paramater is [`Name`](DispositionParam::Name).
    #[inline]
    pub fn is_name(&self) -> bool {
        self.as_name().is_some()
    }

-    /// Returns `true` if the parameter is [`Filename`](DispositionParam::Filename).
+    /// Returns `true` if the paramater is [`Filename`](DispositionParam::Filename).
    #[inline]
    pub fn is_filename(&self) -> bool {
        self.as_filename().is_some()
    }

-    /// Returns `true` if the parameter is [`FilenameExt`](DispositionParam::FilenameExt).
+    /// Returns `true` if the paramater is [`FilenameExt`](DispositionParam::FilenameExt).
    #[inline]
    pub fn is_filename_ext(&self) -> bool {
        self.as_filename_ext().is_some()
    }

-    /// Returns `true` if the parameter is [`Unknown`](DispositionParam::Unknown) and the `name`
+    /// Returns `true` if the paramater is [`Unknown`](DispositionParam::Unknown) and the `name`
    #[inline]
    /// matches.
    pub fn is_unknown<T: AsRef<str>>(&self, name: T) -> bool {
        self.as_unknown(name).is_some()
    }

-    /// Returns `true` if the parameter is [`UnknownExt`](DispositionParam::UnknownExt) and the
+    /// Returns `true` if the paramater is [`UnknownExt`](DispositionParam::UnknownExt) and the
    /// `name` matches.
    #[inline]
    pub fn is_unknown_ext<T: AsRef<str>>(&self, name: T) -> bool {
@ -373,7 +373,7 @@ impl ContentDisposition {
                let param = if param_name.eq_ignore_ascii_case("name") {
                    DispositionParam::Name(value)
                } else if param_name.eq_ignore_ascii_case("filename") {
-                    // See also comments in test_from_raw_unnecessary_percent_decode.
+                    // See also comments in test_from_raw_uncessary_percent_decode.
                    DispositionParam::Filename(value)
                } else {
                    DispositionParam::Unknown(param_name.to_owned(), value)
@ -423,7 +423,7 @@ impl ContentDisposition {

    /// Return the value of *name* if exists.
    pub fn get_name(&self) -> Option<&str> {
-        self.parameters.iter().filter_map(|p| p.as_name()).next()
+        self.parameters.iter().filter_map(|p| p.as_name()).nth(0)
    }

    /// Return the value of *filename* if exists.
@ -431,7 +431,7 @@ impl ContentDisposition {
        self.parameters
            .iter()
            .filter_map(|p| p.as_filename())
-            .next()
+            .nth(0)
    }

    /// Return the value of *filename\** if exists.
@ -439,7 +439,7 @@ impl ContentDisposition {
        self.parameters
            .iter()
            .filter_map(|p| p.as_filename_ext())
-            .next()
+            .nth(0)
    }

    /// Return the value of the parameter which the `name` matches.
@ -448,7 +448,7 @@ impl ContentDisposition {
        self.parameters
            .iter()
            .filter_map(|p| p.as_unknown(name))
-            .next()
+            .nth(0)
    }

    /// Return the value of the extended parameter which the `name` matches.
@ -457,7 +457,7 @@ impl ContentDisposition {
        self.parameters
            .iter()
            .filter_map(|p| p.as_unknown_ext(name))
-            .next()
+            .nth(0)
    }
 }

@ -529,7 +529,7 @@ impl fmt::Display for DispositionParam {
        //               ; to use within parameter values
        //
        //
-        // See also comments in test_from_raw_unnecessary_percent_decode.
+        // See also comments in test_from_raw_uncessary_percent_decode.
        lazy_static! {
            static ref RE: Regex = Regex::new("[\x00-\x08\x10-\x1F\x7F\"\\\\]").unwrap();
        }
@ -676,7 +676,7 @@ mod tests {
    fn test_from_raw_unordered() {
        let a = HeaderValue::from_static(
            "form-data; dummy=3; filename=\"sample.png\" ; name=upload;",
-            // Actually, a trailing semicolon is not compliant. But it is fine to accept.
+            // Actually, a trailling semolocon is not compliant. But it is fine to accept.
        );
        let a: ContentDisposition = ContentDisposition::from_raw(&a).unwrap();
        let b = ContentDisposition {
@ -833,7 +833,7 @@ mod tests {
    }

    #[test]
-    fn test_from_raw_unnecessary_percent_decode() {
+    fn test_from_raw_uncessary_percent_decode() {
        // In fact, RFC7578 (multipart/form-data) Section 2 and 4.2 suggests that filename with
        // non-ASCII characters MAY be percent-encoded.
        // On the contrary, RFC6266 or other RFCs related to Content-Disposition response header
--- a/actix-http/src/header/common/range.rs
+++ b/actix-http/src/header/common/range.rs
@ -7,7 +7,7 @@ use header::{Header, Raw};
 /// `Range` header, defined in [RFC7233](https://tools.ietf.org/html/rfc7233#section-3.1)
 ///
 /// The "Range" header field on a GET request modifies the method
-/// semantics to request transfer of only one or more sub-ranges of the
+/// semantics to request transfer of only one or more subranges of the
 /// selected representation data, rather than the entire selected
 /// representation data.
 ///
@ -183,13 +183,13 @@ impl fmt::Display for Range {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        match *self {
            Range::Bytes(ref ranges) => {
-                write!(f, "bytes=")?;
+                try!(write!(f, "bytes="));

                for (i, range) in ranges.iter().enumerate() {
                    if i != 0 {
-                        f.write_str(",")?;
+                        try!(f.write_str(","));
                    }
-                    Display::fmt(range, f)?;
+                    try!(Display::fmt(range, f));
                }
                Ok(())
            }
@ -214,9 +214,9 @@ impl FromStr for Range {
                }
                Ok(Range::Bytes(ranges))
            }
-            (Some(unit), Some(range_str)) if unit != "" && range_str != "" => {
-                Ok(Range::Unregistered(unit.to_owned(), range_str.to_owned()))
-            }
+            (Some(unit), Some(range_str)) if unit != "" && range_str != "" => Ok(
+                Range::Unregistered(unit.to_owned(), range_str.to_owned()),
+            ),
            _ => Err(::Error::Header),
        }
    }
@ -229,8 +229,7 @@ impl FromStr for ByteRangeSpec {
        let mut parts = s.splitn(2, '-');

        match (parts.next(), parts.next()) {
-            (Some(""), Some(end)) => end
-                .parse()
+            (Some(""), Some(end)) => end.parse()
                .or(Err(::Error::Header))
                .map(ByteRangeSpec::Last),
            (Some(start), Some("")) => start
@ -273,138 +272,163 @@ impl Header for Range {
    }
 }

-#[cfg(test)]
-mod tests {
-    use super::*;
+#[test]
+fn test_parse_bytes_range_valid() {
+    let r: Range = Header::parse_header(&"bytes=1-100".into()).unwrap();
+    let r2: Range = Header::parse_header(&"bytes=1-100,-".into()).unwrap();
+    let r3 = Range::bytes(1, 100);
+    assert_eq!(r, r2);
+    assert_eq!(r2, r3);

-    #[test]
-    fn test_parse_bytes_range_valid() {
-        let r: Range = Header::parse_header(&"bytes=1-100".into()).unwrap();
-        let r2: Range = Header::parse_header(&"bytes=1-100,-".into()).unwrap();
-        let r3 = Range::bytes(1, 100);
-        assert_eq!(r, r2);
-        assert_eq!(r2, r3);
+    let r: Range = Header::parse_header(&"bytes=1-100,200-".into()).unwrap();
+    let r2: Range =
+        Header::parse_header(&"bytes= 1-100 , 101-xxx,  200- ".into()).unwrap();
+    let r3 = Range::Bytes(vec![
+        ByteRangeSpec::FromTo(1, 100),
+        ByteRangeSpec::AllFrom(200),
+    ]);
+    assert_eq!(r, r2);
+    assert_eq!(r2, r3);

-        let r: Range = Header::parse_header(&"bytes=1-100,200-".into()).unwrap();
-        let r2: Range =
-            Header::parse_header(&"bytes= 1-100 , 101-xxx,  200- ".into()).unwrap();
-        let r3 = Range::Bytes(vec![
-            ByteRangeSpec::FromTo(1, 100),
-            ByteRangeSpec::AllFrom(200),
-        ]);
-        assert_eq!(r, r2);
-        assert_eq!(r2, r3);
+    let r: Range = Header::parse_header(&"bytes=1-100,-100".into()).unwrap();
+    let r2: Range = Header::parse_header(&"bytes=1-100, ,,-100".into()).unwrap();
+    let r3 = Range::Bytes(vec![
+        ByteRangeSpec::FromTo(1, 100),
+        ByteRangeSpec::Last(100),
+    ]);
+    assert_eq!(r, r2);
+    assert_eq!(r2, r3);

-        let r: Range = Header::parse_header(&"bytes=1-100,-100".into()).unwrap();
-        let r2: Range = Header::parse_header(&"bytes=1-100, ,,-100".into()).unwrap();
-        let r3 = Range::Bytes(vec![
-            ByteRangeSpec::FromTo(1, 100),
-            ByteRangeSpec::Last(100),
-        ]);
-        assert_eq!(r, r2);
-        assert_eq!(r2, r3);
-
-        let r: Range = Header::parse_header(&"custom=1-100,-100".into()).unwrap();
-        let r2 = Range::Unregistered("custom".to_owned(), "1-100,-100".to_owned());
-        assert_eq!(r, r2);
-    }
-
-    #[test]
-    fn test_parse_unregistered_range_valid() {
-        let r: Range = Header::parse_header(&"custom=1-100,-100".into()).unwrap();
-        let r2 = Range::Unregistered("custom".to_owned(), "1-100,-100".to_owned());
-        assert_eq!(r, r2);
-
-        let r: Range = Header::parse_header(&"custom=abcd".into()).unwrap();
-        let r2 = Range::Unregistered("custom".to_owned(), "abcd".to_owned());
-        assert_eq!(r, r2);
-
-        let r: Range = Header::parse_header(&"custom=xxx-yyy".into()).unwrap();
-        let r2 = Range::Unregistered("custom".to_owned(), "xxx-yyy".to_owned());
-        assert_eq!(r, r2);
-    }
-
-    #[test]
-    fn test_parse_invalid() {
-        let r: ::Result<Range> = Header::parse_header(&"bytes=1-a,-".into());
-        assert_eq!(r.ok(), None);
-
-        let r: ::Result<Range> = Header::parse_header(&"bytes=1-2-3".into());
-        assert_eq!(r.ok(), None);
-
-        let r: ::Result<Range> = Header::parse_header(&"abc".into());
-        assert_eq!(r.ok(), None);
-
-        let r: ::Result<Range> = Header::parse_header(&"bytes=1-100=".into());
-        assert_eq!(r.ok(), None);
-
-        let r: ::Result<Range> = Header::parse_header(&"bytes=".into());
-        assert_eq!(r.ok(), None);
-
-        let r: ::Result<Range> = Header::parse_header(&"custom=".into());
-        assert_eq!(r.ok(), None);
-
-        let r: ::Result<Range> = Header::parse_header(&"=1-100".into());
-        assert_eq!(r.ok(), None);
-    }
-
-    #[test]
-    fn test_fmt() {
-        use header::Headers;
-
-        let mut headers = Headers::new();
-
-        headers.set(Range::Bytes(vec![
-            ByteRangeSpec::FromTo(0, 1000),
-            ByteRangeSpec::AllFrom(2000),
-        ]));
-        assert_eq!(&headers.to_string(), "Range: bytes=0-1000,2000-\r\n");
-
-        headers.clear();
-        headers.set(Range::Bytes(vec![]));
-
-        assert_eq!(&headers.to_string(), "Range: bytes=\r\n");
-
-        headers.clear();
-        headers.set(Range::Unregistered("custom".to_owned(), "1-xxx".to_owned()));
-
-        assert_eq!(&headers.to_string(), "Range: custom=1-xxx\r\n");
-    }
-
-    #[test]
-    fn test_byte_range_spec_to_satisfiable_range() {
-        assert_eq!(
-            Some((0, 0)),
-            ByteRangeSpec::FromTo(0, 0).to_satisfiable_range(3)
-        );
-        assert_eq!(
-            Some((1, 2)),
-            ByteRangeSpec::FromTo(1, 2).to_satisfiable_range(3)
-        );
-        assert_eq!(
-            Some((1, 2)),
-            ByteRangeSpec::FromTo(1, 5).to_satisfiable_range(3)
-        );
-        assert_eq!(None, ByteRangeSpec::FromTo(3, 3).to_satisfiable_range(3));
-        assert_eq!(None, ByteRangeSpec::FromTo(2, 1).to_satisfiable_range(3));
-        assert_eq!(None, ByteRangeSpec::FromTo(0, 0).to_satisfiable_range(0));
-
-        assert_eq!(
-            Some((0, 2)),
-            ByteRangeSpec::AllFrom(0).to_satisfiable_range(3)
-        );
-        assert_eq!(
-            Some((2, 2)),
-            ByteRangeSpec::AllFrom(2).to_satisfiable_range(3)
-        );
-        assert_eq!(None, ByteRangeSpec::AllFrom(3).to_satisfiable_range(3));
-        assert_eq!(None, ByteRangeSpec::AllFrom(5).to_satisfiable_range(3));
-        assert_eq!(None, ByteRangeSpec::AllFrom(0).to_satisfiable_range(0));
-
-        assert_eq!(Some((1, 2)), ByteRangeSpec::Last(2).to_satisfiable_range(3));
-        assert_eq!(Some((2, 2)), ByteRangeSpec::Last(1).to_satisfiable_range(3));
-        assert_eq!(Some((0, 2)), ByteRangeSpec::Last(5).to_satisfiable_range(3));
-        assert_eq!(None, ByteRangeSpec::Last(0).to_satisfiable_range(3));
-        assert_eq!(None, ByteRangeSpec::Last(2).to_satisfiable_range(0));
-    }
+    let r: Range = Header::parse_header(&"custom=1-100,-100".into()).unwrap();
+    let r2 = Range::Unregistered("custom".to_owned(), "1-100,-100".to_owned());
+    assert_eq!(r, r2);
+}
+
+#[test]
+fn test_parse_unregistered_range_valid() {
+    let r: Range = Header::parse_header(&"custom=1-100,-100".into()).unwrap();
+    let r2 = Range::Unregistered("custom".to_owned(), "1-100,-100".to_owned());
+    assert_eq!(r, r2);
+
+    let r: Range = Header::parse_header(&"custom=abcd".into()).unwrap();
+    let r2 = Range::Unregistered("custom".to_owned(), "abcd".to_owned());
+    assert_eq!(r, r2);
+
+    let r: Range = Header::parse_header(&"custom=xxx-yyy".into()).unwrap();
+    let r2 = Range::Unregistered("custom".to_owned(), "xxx-yyy".to_owned());
+    assert_eq!(r, r2);
+}
+
+#[test]
+fn test_parse_invalid() {
+    let r: ::Result<Range> = Header::parse_header(&"bytes=1-a,-".into());
+    assert_eq!(r.ok(), None);
+
+    let r: ::Result<Range> = Header::parse_header(&"bytes=1-2-3".into());
+    assert_eq!(r.ok(), None);
+
+    let r: ::Result<Range> = Header::parse_header(&"abc".into());
+    assert_eq!(r.ok(), None);
+
+    let r: ::Result<Range> = Header::parse_header(&"bytes=1-100=".into());
+    assert_eq!(r.ok(), None);
+
+    let r: ::Result<Range> = Header::parse_header(&"bytes=".into());
+    assert_eq!(r.ok(), None);
+
+    let r: ::Result<Range> = Header::parse_header(&"custom=".into());
+    assert_eq!(r.ok(), None);
+
+    let r: ::Result<Range> = Header::parse_header(&"=1-100".into());
+    assert_eq!(r.ok(), None);
+}
+
+#[test]
+fn test_fmt() {
+    use header::Headers;
+
+    let mut headers = Headers::new();
+
+    headers.set(Range::Bytes(vec![
+        ByteRangeSpec::FromTo(0, 1000),
+        ByteRangeSpec::AllFrom(2000),
+    ]));
+    assert_eq!(&headers.to_string(), "Range: bytes=0-1000,2000-\r\n");
+
+    headers.clear();
+    headers.set(Range::Bytes(vec![]));
+
+    assert_eq!(&headers.to_string(), "Range: bytes=\r\n");
+
+    headers.clear();
+    headers.set(Range::Unregistered(
+        "custom".to_owned(),
+        "1-xxx".to_owned(),
+    ));
+
+    assert_eq!(&headers.to_string(), "Range: custom=1-xxx\r\n");
+}
+
+#[test]
+fn test_byte_range_spec_to_satisfiable_range() {
+    assert_eq!(
+        Some((0, 0)),
+        ByteRangeSpec::FromTo(0, 0).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        Some((1, 2)),
+        ByteRangeSpec::FromTo(1, 2).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        Some((1, 2)),
+        ByteRangeSpec::FromTo(1, 5).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        None,
+        ByteRangeSpec::FromTo(3, 3).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        None,
+        ByteRangeSpec::FromTo(2, 1).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        None,
+        ByteRangeSpec::FromTo(0, 0).to_satisfiable_range(0)
+    );
+
+    assert_eq!(
+        Some((0, 2)),
+        ByteRangeSpec::AllFrom(0).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        Some((2, 2)),
+        ByteRangeSpec::AllFrom(2).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        None,
+        ByteRangeSpec::AllFrom(3).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        None,
+        ByteRangeSpec::AllFrom(5).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        None,
+        ByteRangeSpec::AllFrom(0).to_satisfiable_range(0)
+    );
+
+    assert_eq!(
+        Some((1, 2)),
+        ByteRangeSpec::Last(2).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        Some((2, 2)),
+        ByteRangeSpec::Last(1).to_satisfiable_range(3)
+    );
+    assert_eq!(
+        Some((0, 2)),
+        ByteRangeSpec::Last(5).to_satisfiable_range(3)
+    );
+    assert_eq!(None, ByteRangeSpec::Last(0).to_satisfiable_range(3));
+    assert_eq!(None, ByteRangeSpec::Last(2).to_satisfiable_range(0));
 }
--- a/actix-http/src/header/map.rs
+++ b/actix-http/src/header/map.rs
@ -7,7 +7,7 @@ use http::header::{HeaderName, HeaderValue};

 /// A set of HTTP headers
 ///
-/// `HeaderMap` is an multi-map of [`HeaderName`] to values.
+/// `HeaderMap` is an multimap of [`HeaderName`] to values.
 ///
 /// [`HeaderName`]: struct.HeaderName.html
 #[derive(Debug, Clone)]
--- a/actix-http/src/header/shared/charset.rs
+++ b/actix-http/src/header/shared/charset.rs
@ -137,22 +137,17 @@ impl FromStr for Charset {
    }
 }

-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_parse() {
-        assert_eq!(Us_Ascii, "us-ascii".parse().unwrap());
-        assert_eq!(Us_Ascii, "US-Ascii".parse().unwrap());
-        assert_eq!(Us_Ascii, "US-ASCII".parse().unwrap());
-        assert_eq!(Shift_Jis, "Shift-JIS".parse().unwrap());
-        assert_eq!(Ext("ABCD".to_owned()), "abcd".parse().unwrap());
-    }
-
-    #[test]
-    fn test_display() {
-        assert_eq!("US-ASCII", format!("{}", Us_Ascii));
-        assert_eq!("ABCD", format!("{}", Ext("ABCD".to_owned())));
-    }
+#[test]
+fn test_parse() {
+    assert_eq!(Us_Ascii, "us-ascii".parse().unwrap());
+    assert_eq!(Us_Ascii, "US-Ascii".parse().unwrap());
+    assert_eq!(Us_Ascii, "US-ASCII".parse().unwrap());
+    assert_eq!(Shift_Jis, "Shift-JIS".parse().unwrap());
+    assert_eq!(Ext("ABCD".to_owned()), "abcd".parse().unwrap());
+}
+
+#[test]
+fn test_display() {
+    assert_eq!("US-ASCII", format!("{}", Us_Ascii));
+    assert_eq!("ABCD", format!("{}", Ext("ABCD".to_owned())));
 }
--- a/actix-http/src/header/shared/httpdate.rs
+++ b/actix-http/src/header/shared/httpdate.rs
@ -1,46 +1,59 @@
 use std::fmt::{self, Display};
 use std::io::Write;
 use std::str::FromStr;
-use std::time::{SystemTime, UNIX_EPOCH};
+use std::time::{Duration, SystemTime, UNIX_EPOCH};

 use bytes::{buf::BufMutExt, BytesMut};
 use http::header::{HeaderValue, InvalidHeaderValue};
-use time::{offset, OffsetDateTime, PrimitiveDateTime};

 use crate::error::ParseError;
 use crate::header::IntoHeaderValue;
-use crate::time_parser;

 /// A timestamp with HTTP formatting and parsing
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
-pub struct HttpDate(OffsetDateTime);
+pub struct HttpDate(time::Tm);

 impl FromStr for HttpDate {
    type Err = ParseError;

    fn from_str(s: &str) -> Result<HttpDate, ParseError> {
-        match time_parser::parse_http_date(s) {
-            Some(t) => Ok(HttpDate(t.assume_utc())),
-            None => Err(ParseError::Header),
+        match time::strptime(s, "%a, %d %b %Y %T %Z")
+            .or_else(|_| time::strptime(s, "%A, %d-%b-%y %T %Z"))
+            .or_else(|_| time::strptime(s, "%c"))
+        {
+            Ok(t) => Ok(HttpDate(t)),
+            Err(_) => Err(ParseError::Header),
        }
    }
 }

 impl Display for HttpDate {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::Display::fmt(&self.0.format("%a, %d %b %Y %H:%M:%S GMT"), f)
+        fmt::Display::fmt(&self.0.to_utc().rfc822(), f)
    }
 }

-impl From<OffsetDateTime> for HttpDate {
-    fn from(dt: OffsetDateTime) -> HttpDate {
-        HttpDate(dt)
+impl From<time::Tm> for HttpDate {
+    fn from(tm: time::Tm) -> HttpDate {
+        HttpDate(tm)
    }
 }

 impl From<SystemTime> for HttpDate {
    fn from(sys: SystemTime) -> HttpDate {
-        HttpDate(PrimitiveDateTime::from(sys).assume_utc())
+        let tmspec = match sys.duration_since(UNIX_EPOCH) {
+            Ok(dur) => {
+                time::Timespec::new(dur.as_secs() as i64, dur.subsec_nanos() as i32)
+            }
+            Err(err) => {
+                let neg = err.duration();
+                time::Timespec::new(
+                    -(neg.as_secs() as i64),
+                    -(neg.subsec_nanos() as i32),
+                )
+            }
+        };
+        HttpDate(time::at_utc(tmspec))
    }
 }

@ -49,51 +62,56 @@ impl IntoHeaderValue for HttpDate {

    fn try_into(self) -> Result<HeaderValue, Self::Error> {
        let mut wrt = BytesMut::with_capacity(29).writer();
-        write!(
-            wrt,
-            "{}",
-            self.0
-                .to_offset(offset!(UTC))
-                .format("%a, %d %b %Y %H:%M:%S GMT")
-        )
-        .unwrap();
+        write!(wrt, "{}", self.0.rfc822()).unwrap();
        HeaderValue::from_maybe_shared(wrt.get_mut().split().freeze())
    }
 }

 impl From<HttpDate> for SystemTime {
    fn from(date: HttpDate) -> SystemTime {
-        let dt = date.0;
-        let epoch = OffsetDateTime::unix_epoch();
-
-        UNIX_EPOCH + (dt - epoch)
+        let spec = date.0.to_timespec();
+        if spec.sec >= 0 {
+            UNIX_EPOCH + Duration::new(spec.sec as u64, spec.nsec as u32)
+        } else {
+            UNIX_EPOCH - Duration::new(spec.sec as u64, spec.nsec as u32)
+        }
    }
 }

 #[cfg(test)]
 mod tests {
    use super::HttpDate;
-    use time::{date, time, PrimitiveDateTime};
+    use time::Tm;
+
+    const NOV_07: HttpDate = HttpDate(Tm {
+        tm_nsec: 0,
+        tm_sec: 37,
+        tm_min: 48,
+        tm_hour: 8,
+        tm_mday: 7,
+        tm_mon: 10,
+        tm_year: 94,
+        tm_wday: 0,
+        tm_isdst: 0,
+        tm_yday: 0,
+        tm_utcoff: 0,
+    });

    #[test]
    fn test_date() {
-        let nov_07 = HttpDate(
-            PrimitiveDateTime::new(date!(1994 - 11 - 07), time!(8:48:37)).assume_utc(),
-        );
-
        assert_eq!(
            "Sun, 07 Nov 1994 08:48:37 GMT".parse::<HttpDate>().unwrap(),
-            nov_07
+            NOV_07
        );
        assert_eq!(
            "Sunday, 07-Nov-94 08:48:37 GMT"
                .parse::<HttpDate>()
                .unwrap(),
-            nov_07
+            NOV_07
        );
        assert_eq!(
            "Sun Nov  7 08:48:37 1994".parse::<HttpDate>().unwrap(),
-            nov_07
+            NOV_07
        );
        assert!("this-is-no-date".parse::<HttpDate>().is_err());
    }
--- a/actix-http/src/helpers.rs
+++ b/actix-http/src/helpers.rs
@ -1,46 +1,173 @@
-use std::io;
+use std::{io, mem, ptr, slice};

 use bytes::{BufMut, BytesMut};
 use http::Version;

 use crate::extensions::Extensions;

-const DIGITS_START: u8 = b'0';
+const DEC_DIGITS_LUT: &[u8] = b"0001020304050607080910111213141516171819\
+      2021222324252627282930313233343536373839\
+      4041424344454647484950515253545556575859\
+      6061626364656667686970717273747576777879\
+      8081828384858687888990919293949596979899";

-pub(crate) fn write_status_line(version: Version, n: u16, bytes: &mut BytesMut) {
+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'H', b'T', b'T', b'P', b'/', b'1', b'.', b'1', b' ', b' ', b' ', b' ', b' ',
+    ];
    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
+        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,
+            );
        }
    }

-    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);
-
-    // trailing space before reason
-    bytes.put_u8(b' ');
+    bytes.put_slice(&buf);
+    if four {
+        bytes.put_u8(b' ');
+    }
 }

 /// NOTE: bytes object has to contain enough space
-pub fn write_content_length(n: u64, bytes: &mut BytesMut) {
-    if n == 0 {
-        bytes.put_slice(b"\r\ncontent-length: 0\r\n");
-        return;
+pub fn write_content_length(mut n: usize, bytes: &mut BytesMut) {
+    if n < 10 {
+        let mut buf: [u8; 21] = [
+            b'\r', b'\n', b'c', b'o', b'n', b't', b'e', b'n', b't', b'-', b'l', b'e',
+            b'n', b'g', b't', b'h', b':', b' ', b'0', b'\r', b'\n',
+        ];
+        buf[18] = (n as u8) + b'0';
+        bytes.put_slice(&buf);
+    } else if n < 100 {
+        let mut buf: [u8; 22] = [
+            b'\r', b'\n', b'c', b'o', b'n', b't', b'e', b'n', b't', b'-', b'l', b'e',
+            b'n', b'g', b't', b'h', b':', b' ', b'0', b'0', b'\r', b'\n',
+        ];
+        let d1 = n << 1;
+        unsafe {
+            ptr::copy_nonoverlapping(
+                DEC_DIGITS_LUT.as_ptr().add(d1),
+                buf.as_mut_ptr().offset(18),
+                2,
+            );
+        }
+        bytes.put_slice(&buf);
+    } else if n < 1000 {
+        let mut buf: [u8; 23] = [
+            b'\r', b'\n', b'c', b'o', b'n', b't', b'e', b'n', b't', b'-', b'l', b'e',
+            b'n', b'g', b't', b'h', b':', b' ', b'0', b'0', b'0', b'\r', b'\n',
+        ];
+        // decode 2 more chars, if > 2 chars
+        let d1 = (n % 100) << 1;
+        n /= 100;
+        unsafe {
+            ptr::copy_nonoverlapping(
+                DEC_DIGITS_LUT.as_ptr().add(d1),
+                buf.as_mut_ptr().offset(19),
+                2,
+            )
+        };
+
+        // decode last 1
+        buf[18] = (n as u8) + b'0';
+
+        bytes.put_slice(&buf);
+    } else {
+        bytes.put_slice(b"\r\ncontent-length: ");
+        convert_usize(n, bytes);
+    }
+}
+
+pub(crate) fn convert_usize(mut n: usize, bytes: &mut BytesMut) {
+    let mut curr: isize = 39;
+    let mut buf: [u8; 41] = unsafe { mem::MaybeUninit::uninit().assume_init() };
+    buf[39] = b'\r';
+    buf[40] = b'\n';
+    let buf_ptr = buf.as_mut_ptr();
+    let lut_ptr = DEC_DIGITS_LUT.as_ptr();
+
+    // eagerly decode 4 characters at a time
+    while n >= 10_000 {
+        let rem = (n % 10_000) as isize;
+        n /= 10_000;
+
+        let d1 = (rem / 100) << 1;
+        let d2 = (rem % 100) << 1;
+        curr -= 4;
+        unsafe {
+            ptr::copy_nonoverlapping(lut_ptr.offset(d1), buf_ptr.offset(curr), 2);
+            ptr::copy_nonoverlapping(lut_ptr.offset(d2), buf_ptr.offset(curr + 2), 2);
+        }
    }

-    let mut buf = itoa::Buffer::new();
+    // if we reach here numbers are <= 9999, so at most 4 chars long
+    let mut n = n as isize; // possibly reduce 64bit math

-    bytes.put_slice(b"\r\ncontent-length: ");
-    bytes.put_slice(buf.format(n).as_bytes());
-    bytes.put_slice(b"\r\n");
+    // decode 2 more chars, if > 2 chars
+    if n >= 100 {
+        let d1 = (n % 100) << 1;
+        n /= 100;
+        curr -= 2;
+        unsafe {
+            ptr::copy_nonoverlapping(lut_ptr.offset(d1), 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), buf_ptr.offset(curr), 2);
+        }
+    }
+
+    unsafe {
+        bytes.extend_from_slice(slice::from_raw_parts(
+            buf_ptr.offset(curr),
+            41 - curr as usize,
+        ));
+    }
 }

 pub(crate) struct Writer<'a>(pub &'a mut BytesMut);
@ -69,28 +196,8 @@ impl<T: Clone + 'static> DataFactory for Data<T> {

 #[cfg(test)]
 mod tests {
-    use std::str::from_utf8;
-
    use super::*;

-    #[test]
-    fn test_status_line() {
-        let mut bytes = BytesMut::new();
-        bytes.reserve(50);
-        write_status_line(Version::HTTP_11, 200, &mut bytes);
-        assert_eq!(from_utf8(&bytes.split().freeze()).unwrap(), "HTTP/1.1 200 ");
-
-        let mut bytes = BytesMut::new();
-        bytes.reserve(50);
-        write_status_line(Version::HTTP_09, 404, &mut bytes);
-        assert_eq!(from_utf8(&bytes.split().freeze()).unwrap(), "HTTP/0.9 404 ");
-
-        let mut bytes = BytesMut::new();
-        bytes.reserve(50);
-        write_status_line(Version::HTTP_09, 515, &mut bytes);
-        assert_eq!(from_utf8(&bytes.split().freeze()).unwrap(), "HTTP/0.9 515 ");
-    }
-
    #[test]
    fn test_write_content_length() {
        let mut bytes = BytesMut::new();
@ -124,48 +231,5 @@ mod tests {
        bytes.reserve(50);
        write_content_length(5909, &mut bytes);
        assert_eq!(bytes.split().freeze(), b"\r\ncontent-length: 5909\r\n"[..]);
-        bytes.reserve(50);
-        write_content_length(9999, &mut bytes);
-        assert_eq!(bytes.split().freeze(), b"\r\ncontent-length: 9999\r\n"[..]);
-        bytes.reserve(50);
-        write_content_length(10001, &mut bytes);
-        assert_eq!(bytes.split().freeze(), b"\r\ncontent-length: 10001\r\n"[..]);
-        bytes.reserve(50);
-        write_content_length(59094, &mut bytes);
-        assert_eq!(bytes.split().freeze(), b"\r\ncontent-length: 59094\r\n"[..]);
-        bytes.reserve(50);
-        write_content_length(99999, &mut bytes);
-        assert_eq!(bytes.split().freeze(), b"\r\ncontent-length: 99999\r\n"[..]);
-
-        bytes.reserve(50);
-        write_content_length(590947, &mut bytes);
-        assert_eq!(
-            bytes.split().freeze(),
-            b"\r\ncontent-length: 590947\r\n"[..]
-        );
-        bytes.reserve(50);
-        write_content_length(999999, &mut bytes);
-        assert_eq!(
-            bytes.split().freeze(),
-            b"\r\ncontent-length: 999999\r\n"[..]
-        );
-        bytes.reserve(50);
-        write_content_length(5909471, &mut bytes);
-        assert_eq!(
-            bytes.split().freeze(),
-            b"\r\ncontent-length: 5909471\r\n"[..]
-        );
-        bytes.reserve(50);
-        write_content_length(59094718, &mut bytes);
-        assert_eq!(
-            bytes.split().freeze(),
-            b"\r\ncontent-length: 59094718\r\n"[..]
-        );
-        bytes.reserve(50);
-        write_content_length(4294973728, &mut bytes);
-        assert_eq!(
-            bytes.split().freeze(),
-            b"\r\ncontent-length: 4294973728\r\n"[..]
-        );
    }
 }
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@ -10,9 +10,6 @@
 #[macro_use]
 extern crate log;

-#[macro_use]
-mod macros;
-
 pub mod body;
 mod builder;
 pub mod client;
@ -30,7 +27,6 @@ mod payload;
 mod request;
 mod response;
 mod service;
-mod time_parser;

 pub mod cookie;
 pub mod error;
--- a/actix-http/src/macros.rs
+++ b/actix-http/src/macros.rs
@ -1,95 +0,0 @@
-#[macro_export]
-macro_rules! downcast_get_type_id {
-    () => {
-        /// A helper method to get the type ID of the type
-        /// this trait is implemented on.
-        /// This method is unsafe to *implement*, since `downcast_ref` relies
-        /// on the returned `TypeId` to perform a cast.
-        ///
-        /// Unfortunately, Rust has no notion of a trait method that is
-        /// unsafe to implement (marking it as `unsafe` makes it unsafe
-        /// to *call*). As a workaround, we require this method
-        /// to return a private type along with the `TypeId`. This
-        /// private type (`PrivateHelper`) has a private constructor,
-        /// making it impossible for safe code to construct outside of
-        /// this module. This ensures that safe code cannot violate
-        /// type-safety by implementing this method.
-        #[doc(hidden)]
-        fn __private_get_type_id__(&self) -> (std::any::TypeId, PrivateHelper)
-        where
-            Self: 'static,
-        {
-            (std::any::TypeId::of::<Self>(), PrivateHelper(()))
-        }
-    };
-}
-
-//Generate implementation for dyn $name
-#[macro_export]
-macro_rules! downcast {
-    ($name:ident) => {
-        /// A struct with a private constructor, for use with
-        /// `__private_get_type_id__`. Its single field is private,
-        /// ensuring that it can only be constructed from this module
-        #[doc(hidden)]
-        pub struct PrivateHelper(());
-
-        impl dyn $name + 'static {
-            /// Downcasts generic body to a specific type.
-            pub fn downcast_ref<T: $name + 'static>(&self) -> Option<&T> {
-                if self.__private_get_type_id__().0 == std::any::TypeId::of::<T>() {
-                    // Safety: external crates cannot override the default
-                    // implementation of `__private_get_type_id__`, since
-                    // it requires returning a private type. We can therefore
-                    // rely on the returned `TypeId`, which ensures that this
-                    // case is correct.
-                    unsafe { Some(&*(self as *const dyn $name as *const T)) }
-                } else {
-                    None
-                }
-            }
-            /// Downcasts a generic body to a mutable specific type.
-            pub fn downcast_mut<T: $name + 'static>(&mut self) -> Option<&mut T> {
-                if self.__private_get_type_id__().0 == std::any::TypeId::of::<T>() {
-                    // Safety: external crates cannot override the default
-                    // implementation of `__private_get_type_id__`, since
-                    // it requires returning a private type. We can therefore
-                    // rely on the returned `TypeId`, which ensures that this
-                    // case is correct.
-                    unsafe {
-                        Some(&mut *(self as *const dyn $name as *const T as *mut T))
-                    }
-                } else {
-                    None
-                }
-            }
-        }
-    };
-}
-
-#[cfg(test)]
-mod tests {
-
-    trait MB {
-        downcast_get_type_id!();
-    }
-
-    downcast!(MB);
-
-    impl MB for String {}
-    impl MB for () {}
-
-    #[actix_rt::test]
-    async fn test_any_casting() {
-        let mut body = String::from("hello cast");
-        let resp_body: &mut dyn MB = &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_str("!");
-        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());
-    }
-}
--- a/actix-http/src/message.rs
+++ b/actix-http/src/message.rs
@ -99,13 +99,13 @@ impl RequestHead {
    }

    /// Is to uppercase headers with Camel-Case.
-    /// Default is `false`
+    /// Befault is `false`
    #[inline]
    pub fn camel_case_headers(&self) -> bool {
        self.flags.contains(Flags::CAMEL_CASE)
    }

-    /// Set `true` to send headers which are formatted as Camel-Case.
+    /// Set `true` to send headers which are uppercased with Camel-Case.
    #[inline]
    pub fn set_camel_case_headers(&mut self, val: bool) {
        if val {
--- a/actix-http/src/response.rs
+++ b/actix-http/src/response.rs
@ -9,6 +9,7 @@ use std::{fmt, str};
 use bytes::{Bytes, BytesMut};
 use futures_core::Stream;
 use serde::Serialize;
+use serde_json;

 use crate::body::{Body, BodyStream, MessageBody, ResponseBody};
 use crate::cookie::{Cookie, CookieJar};
@ -472,9 +473,7 @@ impl ResponseBuilder {

    /// Disable chunked transfer encoding for HTTP/1.1 streaming responses.
    #[inline]
-    pub fn no_chunking(&mut self, len: u64) -> &mut Self {
-        self.header(header::CONTENT_LENGTH, len);
-
+    pub fn no_chunking(&mut self) -> &mut Self {
        if let Some(parts) = parts(&mut self.head, &self.err) {
            parts.no_chunking(true);
        }
@ -499,6 +498,12 @@ impl ResponseBuilder {
        self
    }

+    /// Set content length
+    #[inline]
+    pub fn content_length(&mut self, len: u64) -> &mut Self {
+        self.header(header::CONTENT_LENGTH, len)
+    }
+
    /// Set a cookie
    ///
    /// ```rust
@ -632,7 +637,7 @@ impl ResponseBuilder {
    /// `ResponseBuilder` can not be used after this call.
    pub fn streaming<S, E>(&mut self, stream: S) -> Response
    where
-        S: Stream<Item = Result<Bytes, E>> + Unpin + 'static,
+        S: Stream<Item = Result<Bytes, E>> + 'static,
        E: Into<Error> + 'static,
    {
        self.body(Body::from_message(BodyStream::new(stream)))
--- a/actix-http/src/time_parser.rs
+++ b/actix-http/src/time_parser.rs
@ -1,42 +0,0 @@
-use time::{Date, OffsetDateTime, PrimitiveDateTime};
-
-/// Attempt to parse a `time` string as one of either RFC 1123, RFC 850, or asctime.
-pub fn parse_http_date(time: &str) -> Option<PrimitiveDateTime> {
-    try_parse_rfc_1123(time)
-        .or_else(|| try_parse_rfc_850(time))
-        .or_else(|| try_parse_asctime(time))
-}
-
-/// Attempt to parse a `time` string as a RFC 1123 formatted date time string.
-fn try_parse_rfc_1123(time: &str) -> Option<PrimitiveDateTime> {
-    time::parse(time, "%a, %d %b %Y %H:%M:%S").ok()
-}
-
-/// Attempt to parse a `time` string as a RFC 850 formatted date time string.
-fn try_parse_rfc_850(time: &str) -> Option<PrimitiveDateTime> {
-    match PrimitiveDateTime::parse(time, "%A, %d-%b-%y %H:%M:%S") {
-        Ok(dt) => {
-            // If the `time` string contains a two-digit year, then as per RFC 2616 § 19.3,
-            // we consider the year as part of this century if it's within the next 50 years,
-            // otherwise we consider as part of the previous century.
-            let now = OffsetDateTime::now_utc();
-            let century_start_year = (now.year() / 100) * 100;
-            let mut expanded_year = century_start_year + dt.year();
-
-            if expanded_year > now.year() + 50 {
-                expanded_year -= 100;
-            }
-
-            match Date::try_from_ymd(expanded_year, dt.month(), dt.day()) {
-                Ok(date) => Some(PrimitiveDateTime::new(date, dt.time())),
-                Err(_) => None,
-            }
-        }
-        Err(_) => None,
-    }
-}
-
-/// Attempt to parse a `time` string using ANSI C's `asctime` format.
-fn try_parse_asctime(time: &str) -> Option<PrimitiveDateTime> {
-    time::parse(time, "%a %b %_d %H:%M:%S %Y").ok()
-}
--- a/actix-http/src/ws/codec.rs
+++ b/actix-http/src/ws/codec.rs
@ -137,7 +137,7 @@ impl Encoder for Codec {
                        Parser::write_message(
                            dst,
                            &data[..],
-                            OpCode::Text,
+                            OpCode::Binary,
                            false,
                            !self.flags.contains(Flags::SERVER),
                        )
@ -151,7 +151,7 @@ impl Encoder for Codec {
                        Parser::write_message(
                            dst,
                            &data[..],
-                            OpCode::Binary,
+                            OpCode::Text,
                            false,
                            !self.flags.contains(Flags::SERVER),
                        )
--- a/actix-http/src/ws/frame.rs
+++ b/actix-http/src/ws/frame.rs
@ -2,6 +2,7 @@ use std::convert::TryFrom;

 use bytes::{Buf, BufMut, BytesMut};
 use log::debug;
+use rand;

 use crate::ws::mask::apply_mask;
 use crate::ws::proto::{CloseCode, CloseReason, OpCode};
--- a/actix-http/src/ws/mod.rs
+++ b/actix-http/src/ws/mod.rs
@ -58,8 +58,6 @@ pub enum ProtocolError {
    Io(io::Error),
 }

-impl std::error::Error for ProtocolError {}
-
 impl ResponseError for ProtocolError {}

 /// Websocket handshake errors
@ -110,7 +108,7 @@ impl ResponseError for HandshakeError {
    }
 }

-/// Verify `WebSocket` handshake request and create handshake response.
+/// Verify `WebSocket` handshake request and create handshake reponse.
 // /// `protocols` is a sequence of known protocols. On successful handshake,
 // /// the returned response headers contain the first protocol in this list
 // /// which the server also knows.
@ -170,7 +168,7 @@ pub fn verify_handshake(req: &RequestHead) -> Result<(), HandshakeError> {
    Ok(())
 }

-/// Create websocket handshake response
+/// Create websocket's handshake response
 ///
 /// This function returns handshake `Response`, ready to send to peer.
 pub fn handshake_response(req: &RequestHead) -> ResponseBuilder {
--- a/actix-http/src/ws/proto.rs
+++ b/actix-http/src/ws/proto.rs
@ -1,3 +1,5 @@
+use base64;
+use sha1;
 use std::convert::{From, Into};
 use std::fmt;

@ -203,7 +205,7 @@ impl<T: Into<String>> From<(CloseCode, T)> for CloseReason {

 static WS_GUID: &str = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";

-// TODO: hash is always same size, we don't need String
+// TODO: hash is always same size, we dont need String
 pub fn hash_key(key: &[u8]) -> String {
    use sha1::Digest;
    let mut hasher = sha1::Sha1::new();
--- a/actix-http/tests/test_client.rs
+++ b/actix-http/tests/test_client.rs
@ -1,6 +1,6 @@
 use actix_service::ServiceFactory;
 use bytes::Bytes;
-use futures_util::future::{self, ok};
+use futures::future::{self, ok};

 use actix_http::{http, HttpService, Request, Response};
 use actix_http_test::test_server;
@ -33,8 +33,7 @@ async fn test_h1_v2() {
        HttpService::build()
            .finish(|_| future::ok::<_, ()>(Response::Ok().body(STR)))
            .tcp()
-    })
-    .await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -62,8 +61,7 @@ async fn test_connection_close() {
            .finish(|_| ok::<_, ()>(Response::Ok().body(STR)))
            .tcp()
            .map(|_| ())
-    })
-    .await;
+    });

    let response = srv.get("/").force_close().send().await.unwrap();
    assert!(response.status().is_success());
@ -82,8 +80,7 @@ async fn test_with_query_parameter() {
            })
            .tcp()
            .map(|_| ())
-    })
-    .await;
+    });

    let request = srv.request(http::Method::GET, srv.url("/?qp=5"));
    let response = request.send().await.unwrap();
--- a/actix-http/tests/test_openssl.rs
+++ b/actix-http/tests/test_openssl.rs
@ -5,8 +5,8 @@ use actix_http_test::test_server;
 use actix_service::{fn_service, ServiceFactory};

 use bytes::{Bytes, BytesMut};
-use futures_util::future::{err, ok, ready};
-use futures_util::stream::{once, Stream, StreamExt};
+use futures::future::{err, ok, ready};
+use futures::stream::{once, Stream, StreamExt};
 use open_ssl::ssl::{AlpnError, SslAcceptor, SslFiletype, SslMethod};

 use actix_http::error::{ErrorBadRequest, PayloadError};
@ -67,8 +67,7 @@ async fn test_h2() -> io::Result<()> {
            .h2(|_| ok::<_, Error>(Response::Ok().finish()))
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -86,8 +85,7 @@ async fn test_h2_1() -> io::Result<()> {
            })
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -99,14 +97,15 @@ async fn test_h2_body() -> io::Result<()> {
    let data = "HELLOWORLD".to_owned().repeat(64 * 1024);
    let mut srv = test_server(move || {
        HttpService::build()
-            .h2(|mut req: Request<_>| async move {
-                let body = load_body(req.take_payload()).await?;
-                Ok::<_, Error>(Response::Ok().body(body))
+            .h2(|mut req: Request<_>| {
+                async move {
+                    let body = load_body(req.take_payload()).await?;
+                    Ok::<_, Error>(Response::Ok().body(body))
+                }
            })
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.sget("/").send_body(data.clone()).await.unwrap();
    assert!(response.status().is_success());
@ -134,8 +133,7 @@ async fn test_h2_content_length() {
            })
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let header = HeaderName::from_static("content-length");
    let value = HeaderValue::from_static("0");
@ -196,7 +194,7 @@ async fn test_h2_headers() {
        })
            .openssl(ssl_acceptor())
                    .map_err(|_| ())
-    }).await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -235,8 +233,7 @@ async fn test_h2_body2() {
            .h2(|_| ok::<_, ()>(Response::Ok().body(STR)))
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -253,8 +250,7 @@ async fn test_h2_head_empty() {
            .finish(|_| ok::<_, ()>(Response::Ok().body(STR)))
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.shead("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -275,12 +271,11 @@ async fn test_h2_head_binary() {
    let mut srv = test_server(move || {
        HttpService::build()
            .h2(|_| {
-                ok::<_, ()>(Response::Ok().body(STR))
+                ok::<_, ()>(Response::Ok().content_length(STR.len() as u64).body(STR))
            })
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.shead("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -302,8 +297,7 @@ async fn test_h2_head_binary2() {
            .h2(|_| ok::<_, ()>(Response::Ok().body(STR)))
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.shead("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -326,8 +320,7 @@ async fn test_h2_body_length() {
            })
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -351,8 +344,7 @@ async fn test_h2_body_chunked_explicit() {
            })
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -379,8 +371,7 @@ async fn test_h2_response_http_error_handling() {
            }))
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert_eq!(response.status(), StatusCode::INTERNAL_SERVER_ERROR);
@ -397,8 +388,7 @@ async fn test_h2_service_error() {
            .h2(|_| err::<Response, Error>(ErrorBadRequest("error")))
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert_eq!(response.status(), StatusCode::BAD_REQUEST);
@ -419,8 +409,7 @@ async fn test_h2_on_connect() {
            })
            .openssl(ssl_acceptor())
            .map_err(|_| ())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
--- a/actix-http/tests/test_rustls.rs
+++ b/actix-http/tests/test_rustls.rs
@ -7,8 +7,8 @@ use actix_http_test::test_server;
 use actix_service::{fn_factory_with_config, fn_service};

 use bytes::{Bytes, BytesMut};
-use futures_util::future::{self, err, ok};
-use futures_util::stream::{once, Stream, StreamExt};
+use futures::future::{self, err, ok};
+use futures::stream::{once, Stream, StreamExt};
 use rust_tls::{
    internal::pemfile::{certs, pkcs8_private_keys},
    NoClientAuth, ServerConfig as RustlsServerConfig,
@ -45,8 +45,7 @@ async fn test_h1() -> io::Result<()> {
        HttpService::build()
            .h1(|_| future::ok::<_, Error>(Response::Ok().finish()))
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -59,8 +58,7 @@ async fn test_h2() -> io::Result<()> {
        HttpService::build()
            .h2(|_| future::ok::<_, Error>(Response::Ok().finish()))
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -77,8 +75,7 @@ async fn test_h1_1() -> io::Result<()> {
                future::ok::<_, Error>(Response::Ok().finish())
            })
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -95,8 +92,7 @@ async fn test_h2_1() -> io::Result<()> {
                future::ok::<_, Error>(Response::Ok().finish())
            })
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -108,13 +104,14 @@ async fn test_h2_body1() -> io::Result<()> {
    let data = "HELLOWORLD".to_owned().repeat(64 * 1024);
    let mut srv = test_server(move || {
        HttpService::build()
-            .h2(|mut req: Request<_>| async move {
-                let body = load_body(req.take_payload()).await?;
-                Ok::<_, Error>(Response::Ok().body(body))
+            .h2(|mut req: Request<_>| {
+                async move {
+                    let body = load_body(req.take_payload()).await?;
+                    Ok::<_, Error>(Response::Ok().body(body))
+                }
            })
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send_body(data.clone()).await.unwrap();
    assert!(response.status().is_success());
@ -141,8 +138,7 @@ async fn test_h2_content_length() {
                future::ok::<_, ()>(Response::new(statuses[indx]))
            })
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let header = HeaderName::from_static("content-length");
    let value = HeaderValue::from_static("0");
@ -201,7 +197,7 @@ async fn test_h2_headers() {
            future::ok::<_, ()>(config.body(data.clone()))
        })
            .rustls(ssl_acceptor())
-    }).await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -239,8 +235,7 @@ async fn test_h2_body2() {
        HttpService::build()
            .h2(|_| future::ok::<_, ()>(Response::Ok().body(STR)))
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -256,8 +251,7 @@ async fn test_h2_head_empty() {
        HttpService::build()
            .finish(|_| ok::<_, ()>(Response::Ok().body(STR)))
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.shead("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -281,11 +275,10 @@ async fn test_h2_head_binary() {
    let mut srv = test_server(move || {
        HttpService::build()
            .h2(|_| {
-                ok::<_, ()>(Response::Ok().body(STR))
+                ok::<_, ()>(Response::Ok().content_length(STR.len() as u64).body(STR))
            })
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.shead("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -309,8 +302,7 @@ async fn test_h2_head_binary2() {
        HttpService::build()
            .h2(|_| ok::<_, ()>(Response::Ok().body(STR)))
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.shead("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -335,8 +327,7 @@ async fn test_h2_body_length() {
                )
            })
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -359,8 +350,7 @@ async fn test_h2_body_chunked_explicit() {
                )
            })
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -388,8 +378,7 @@ async fn test_h2_response_http_error_handling() {
                }))
            }))
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert_eq!(response.status(), http::StatusCode::INTERNAL_SERVER_ERROR);
@ -405,8 +394,7 @@ async fn test_h2_service_error() {
        HttpService::build()
            .h2(|_| err::<Response, Error>(error::ErrorBadRequest("error")))
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert_eq!(response.status(), http::StatusCode::BAD_REQUEST);
@ -422,8 +410,7 @@ async fn test_h1_service_error() {
        HttpService::build()
            .h1(|_| err::<Response, Error>(error::ErrorBadRequest("error")))
            .rustls(ssl_acceptor())
-    })
-    .await;
+    });

    let response = srv.sget("/").send().await.unwrap();
    assert_eq!(response.status(), http::StatusCode::BAD_REQUEST);
--- a/actix-http/tests/test_server.rs
+++ b/actix-http/tests/test_server.rs
@ -6,8 +6,8 @@ use actix_http_test::test_server;
 use actix_rt::time::delay_for;
 use actix_service::fn_service;
 use bytes::Bytes;
-use futures_util::future::{self, err, ok, ready, FutureExt};
-use futures_util::stream::{once, StreamExt};
+use futures::future::{self, err, ok, ready, FutureExt};
+use futures::stream::{once, StreamExt};
 use regex::Regex;

 use actix_http::httpmessage::HttpMessage;
@ -27,8 +27,7 @@ async fn test_h1() {
                future::ok::<_, ()>(Response::Ok().finish())
            })
            .tcp()
-    })
-    .await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -47,8 +46,7 @@ async fn test_h1_2() {
                future::ok::<_, ()>(Response::Ok().finish())
            })
            .tcp()
-    })
-    .await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -67,8 +65,7 @@ async fn test_expect_continue() {
            }))
            .finish(|_| future::ok::<_, ()>(Response::Ok().finish()))
            .tcp()
-    })
-    .await;
+    });

    let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
    let _ = stream.write_all(b"GET /test HTTP/1.1\r\nexpect: 100-continue\r\n\r\n");
@ -98,8 +95,7 @@ async fn test_expect_continue_h1() {
            }))
            .h1(fn_service(|_| future::ok::<_, ()>(Response::Ok().finish())))
            .tcp()
-    })
-    .await;
+    });

    let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
    let _ = stream.write_all(b"GET /test HTTP/1.1\r\nexpect: 100-continue\r\n\r\n");
@ -134,8 +130,7 @@ async fn test_chunked_payload() {
                    })
            }))
            .tcp()
-    })
-    .await;
+    });

    let returned_size = {
        let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
@ -177,8 +172,7 @@ async fn test_slow_request() {
            .client_timeout(100)
            .finish(|_| future::ok::<_, ()>(Response::Ok().finish()))
            .tcp()
-    })
-    .await;
+    });

    let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
    let _ = stream.write_all(b"GET /test/tests/test HTTP/1.1\r\n");
@ -193,8 +187,7 @@ async fn test_http1_malformed_request() {
        HttpService::build()
            .h1(|_| future::ok::<_, ()>(Response::Ok().finish()))
            .tcp()
-    })
-    .await;
+    });

    let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
    let _ = stream.write_all(b"GET /test/tests/test HTTP1.1\r\n");
@ -209,8 +202,7 @@ async fn test_http1_keepalive() {
        HttpService::build()
            .h1(|_| future::ok::<_, ()>(Response::Ok().finish()))
            .tcp()
-    })
-    .await;
+    });

    let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
    let _ = stream.write_all(b"GET /test/tests/test HTTP/1.1\r\n\r\n");
@ -231,8 +223,7 @@ async fn test_http1_keepalive_timeout() {
            .keep_alive(1)
            .h1(|_| future::ok::<_, ()>(Response::Ok().finish()))
            .tcp()
-    })
-    .await;
+    });

    let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
    let _ = stream.write_all(b"GET /test/tests/test HTTP/1.1\r\n\r\n");
@ -252,8 +243,7 @@ async fn test_http1_keepalive_close() {
        HttpService::build()
            .h1(|_| future::ok::<_, ()>(Response::Ok().finish()))
            .tcp()
-    })
-    .await;
+    });

    let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
    let _ =
@ -273,8 +263,7 @@ async fn test_http10_keepalive_default_close() {
        HttpService::build()
            .h1(|_| future::ok::<_, ()>(Response::Ok().finish()))
            .tcp()
-    })
-    .await;
+    });

    let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
    let _ = stream.write_all(b"GET /test/tests/test HTTP/1.0\r\n\r\n");
@ -293,8 +282,7 @@ async fn test_http10_keepalive() {
        HttpService::build()
            .h1(|_| future::ok::<_, ()>(Response::Ok().finish()))
            .tcp()
-    })
-    .await;
+    });

    let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
    let _ = stream
@ -321,8 +309,7 @@ async fn test_http1_keepalive_disabled() {
            .keep_alive(KeepAlive::Disabled)
            .h1(|_| future::ok::<_, ()>(Response::Ok().finish()))
            .tcp()
-    })
-    .await;
+    });

    let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
    let _ = stream.write_all(b"GET /test/tests/test HTTP/1.1\r\n\r\n");
@ -357,8 +344,7 @@ async fn test_content_length() {
                future::ok::<_, ()>(Response::new(statuses[indx]))
            })
            .tcp()
-    })
-    .await;
+    });

    let header = HeaderName::from_static("content-length");
    let value = HeaderValue::from_static("0");
@ -411,7 +397,7 @@ async fn test_h1_headers() {
            }
            future::ok::<_, ()>(builder.body(data.clone()))
        }).tcp()
-    }).await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -449,8 +435,7 @@ async fn test_h1_body() {
        HttpService::build()
            .h1(|_| ok::<_, ()>(Response::Ok().body(STR)))
            .tcp()
-    })
-    .await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -466,8 +451,7 @@ async fn test_h1_head_empty() {
        HttpService::build()
            .h1(|_| ok::<_, ()>(Response::Ok().body(STR)))
            .tcp()
-    })
-    .await;
+    });

    let response = srv.head("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -490,11 +474,10 @@ async fn test_h1_head_binary() {
    let mut srv = test_server(|| {
        HttpService::build()
            .h1(|_| {
-                ok::<_, ()>(Response::Ok().body(STR))
+                ok::<_, ()>(Response::Ok().content_length(STR.len() as u64).body(STR))
            })
            .tcp()
-    })
-    .await;
+    });

    let response = srv.head("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -518,8 +501,7 @@ async fn test_h1_head_binary2() {
        HttpService::build()
            .h1(|_| ok::<_, ()>(Response::Ok().body(STR)))
            .tcp()
-    })
-    .await;
+    });

    let response = srv.head("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -544,8 +526,7 @@ async fn test_h1_body_length() {
                )
            })
            .tcp()
-    })
-    .await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -568,8 +549,7 @@ async fn test_h1_body_chunked_explicit() {
                )
            })
            .tcp()
-    })
-    .await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -599,8 +579,7 @@ async fn test_h1_body_chunked_implicit() {
                ok::<_, ()>(Response::Ok().streaming(body))
            })
            .tcp()
-    })
-    .await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert!(response.status().is_success());
@ -632,8 +611,7 @@ async fn test_h1_response_http_error_handling() {
                )
            }))
            .tcp()
-    })
-    .await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert_eq!(response.status(), http::StatusCode::INTERNAL_SERVER_ERROR);
@ -649,8 +627,7 @@ async fn test_h1_service_error() {
        HttpService::build()
            .h1(|_| future::err::<Response, Error>(error::ErrorBadRequest("error")))
            .tcp()
-    })
-    .await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert_eq!(response.status(), http::StatusCode::BAD_REQUEST);
@ -670,8 +647,7 @@ async fn test_h1_on_connect() {
                future::ok::<_, ()>(Response::Ok().finish())
            })
            .tcp()
-    })
-    .await;
+    });

    let response = srv.get("/").send().await.unwrap();
    assert!(response.status().is_success());
--- a/actix-http/tests/test_ws.rs
+++ b/actix-http/tests/test_ws.rs
@ -1,5 +1,4 @@
 use std::cell::Cell;
-use std::future::Future;
 use std::marker::PhantomData;
 use std::pin::Pin;
 use std::sync::{Arc, Mutex};
@ -10,9 +9,9 @@ use actix_http_test::test_server;
 use actix_service::{fn_factory, Service};
 use actix_utils::framed::Dispatcher;
 use bytes::Bytes;
-use futures_util::future;
-use futures_util::task::{Context, Poll};
-use futures_util::{SinkExt, StreamExt};
+use futures::future;
+use futures::task::{Context, Poll};
+use futures::{Future, SinkExt, StreamExt};

 struct WsService<T>(Arc<Mutex<(PhantomData<T>, Cell<bool>)>>);

@ -94,8 +93,7 @@ async fn test_simple() {
                .finish(|_| future::ok::<_, ()>(Response::NotFound()))
                .tcp()
        }
-    })
-    .await;
+    });

    // client service
    let mut framed = srv.ws().await.unwrap();
--- a/actix-identity/CHANGES.md
+++ b/actix-identity/CHANGES.md
@ -0,0 +1,13 @@
+# Changes
+
+## [0.2.1] - 2020-01-10
+
+* Fix panic with already borrowed: BorrowMutError #1263
+
+## [0.2.0] - 2019-12-20
+
+* Use actix-web 2.0
+
+## [0.1.0] - 2019-06-xx
+
+* Move identity middleware to separate crate
--- a/actix-identity/Cargo.toml
+++ b/actix-identity/Cargo.toml
@ -0,0 +1,29 @@
+[package]
+name = "actix-identity"
+version = "0.2.1"
+authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
+description = "Identity service for actix web framework."
+readme = "README.md"
+keywords = ["http", "web", "framework", "async", "futures"]
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-web.git"
+documentation = "https://docs.rs/actix-identity/"
+license = "MIT/Apache-2.0"
+edition = "2018"
+
+[lib]
+name = "actix_identity"
+path = "src/lib.rs"
+
+[dependencies]
+actix-web = { version = "2.0.0", default-features = false, features = ["secure-cookies"] }
+actix-service = "1.0.2"
+futures = "0.3.1"
+serde = "1.0"
+serde_json = "1.0"
+time = "0.1.42"
+
+[dev-dependencies]
+actix-rt = "1.0.0"
+actix-http = "1.0.1"
+bytes = "0.5.3"
--- a/actix-identity/LICENSE-APACHE
+++ b/actix-identity/LICENSE-APACHE
@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-identity/LICENSE-MIT
+++ b/actix-identity/LICENSE-MIT
@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-identity/README.md
+++ b/actix-identity/README.md
@ -1,7 +1,5 @@
 # Identity service for actix web framework [![Build Status](https://travis-ci.org/actix/actix-web.svg?branch=master)](https://travis-ci.org/actix/actix-web) [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) [![crates.io](https://meritbadge.herokuapp.com/actix-identity)](https://crates.io/crates/actix-identity) [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-**This crate moved to https://github.com/actix/actix-extras.**
-
 ## Documentation & community resources

 * [User Guide](https://actix.rs/docs/)
--- a/actix-identity/src/lib.rs
+++ b/actix-identity/src/lib.rs
--- a/actix-multipart/CHANGES.md
+++ b/actix-multipart/CHANGES.md
@ -1,15 +1,5 @@
 # Changes

-## [Unreleased] - 2020-xx-xx
-
-* Bump minimum supported Rust version to 1.40
-
-## [0.2.1] - 2020-01-xx
-
-* Remove the unused `time` dependency
-
-* Fix missing `std::error::Error` implement for `MultipartError`.
-
 ## [0.2.0] - 2019-12-20

 * Release
@ -54,4 +44,4 @@

 * Split multipart support to separate crate

-* Optimize multipart handling #634, #769
+* Optimize multipart handling #634, #769
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@ -16,17 +16,18 @@ name = "actix_multipart"
 path = "src/lib.rs"

 [dependencies]
-actix-web = { version = "3.0.0-alpha.3", default-features = false }
+actix-web = { version = "2.0.0-rc", default-features = false }
 actix-service = "1.0.1"
 actix-utils = "1.0.3"
 bytes = "0.5.3"
 derive_more = "0.99.2"
 httparse = "1.3"
-futures-util = { version = "0.3.5", default-features = false }
+futures = "0.3.1"
 log = "0.4"
 mime = "0.3"
+time = "0.1"
 twoway = "0.2"

 [dev-dependencies]
 actix-rt = "1.0.0"
-actix-http = "2.0.0-alpha.4"
+actix-http = "1.0.0"
--- a/actix-multipart/README.md
+++ b/actix-multipart/README.md
@ -5,4 +5,4 @@
 * [API Documentation](https://docs.rs/actix-multipart/)
 * [Chat on gitter](https://gitter.im/actix/actix)
 * Cargo package: [actix-multipart](https://crates.io/crates/actix-multipart)
-* Minimum supported Rust version: 1.40 or later
+* Minimum supported Rust version: 1.39 or later
--- a/actix-multipart/src/error.rs
+++ b/actix-multipart/src/error.rs
@ -33,8 +33,6 @@ pub enum MultipartError {
    NotConsumed,
 }

-impl std::error::Error for MultipartError {}
-
 /// Return `BadRequest` for `MultipartError`
 impl ResponseError for MultipartError {
    fn status_code(&self) -> StatusCode {
--- a/actix-multipart/src/extractor.rs
+++ b/actix-multipart/src/extractor.rs
@ -1,6 +1,6 @@
 //! Multipart payload support
 use actix_web::{dev::Payload, Error, FromRequest, HttpRequest};
-use futures_util::future::{ok, Ready};
+use futures::future::{ok, Ready};

 use crate::server::Multipart;

@ -11,7 +11,7 @@ use crate::server::Multipart;
 /// ## Server example
 ///
 /// ```rust
-/// use futures_util::stream::{Stream, StreamExt};
+/// use futures::{Stream, StreamExt};
 /// use actix_web::{web, HttpResponse, Error};
 /// use actix_multipart as mp;
 ///
--- a/actix-multipart/src/server.rs
+++ b/actix-multipart/src/server.rs
@ -8,7 +8,7 @@ use std::task::{Context, Poll};
 use std::{cmp, fmt};

 use bytes::{Bytes, BytesMut};
-use futures_util::stream::{LocalBoxStream, Stream, StreamExt};
+use futures::stream::{LocalBoxStream, Stream, StreamExt};
 use httparse;
 use mime;

@ -814,7 +814,7 @@ mod tests {
    use actix_utils::mpsc;
    use actix_web::http::header::{DispositionParam, DispositionType};
    use bytes::Bytes;
-    use futures_util::future::lazy;
+    use futures::future::lazy;

    #[actix_rt::test]
    async fn test_boundary() {
--- a/actix-session/CHANGES.md
+++ b/actix-session/CHANGES.md
@ -0,0 +1,68 @@
+# Changes
+
+## [0.3.0] - 2019-12-20
+
+* Release
+
+## [0.3.0-alpha.4] - 2019-12-xx
+
+* Allow access to sessions also from not mutable references to the request
+
+## [0.3.0-alpha.3] - 2019-12-xx
+
+* Add access to the session from RequestHead for use of session from guard methods
+
+* Migrate to `std::future`
+
+* Migrate to `actix-web` 2.0
+
+## [0.2.0] - 2019-07-08
+
+* Enhanced ``actix-session`` to facilitate state changes.  Use ``Session.renew()``
+  at successful login to cycle a session (new key/cookie but keeps state).
+  Use ``Session.purge()`` at logout to invalid a session cookie (and remove
+  from redis cache, if applicable).
+
+## [0.1.1] - 2019-06-03
+
+* Fix optional cookie session support
+
+## [0.1.0] - 2019-05-18
+
+* Use actix-web 1.0.0-rc
+
+## [0.1.0-beta.4] - 2019-05-12
+
+* Use actix-web 1.0.0-beta.4
+
+## [0.1.0-beta.2] - 2019-04-28
+
+* Add helper trait `UserSession` which allows to get session for ServiceRequest and HttpRequest
+
+## [0.1.0-beta.1] - 2019-04-20
+
+* Update actix-web to beta.1
+
+* `CookieSession::max_age()` accepts value in seconds
+
+## [0.1.0-alpha.6] - 2019-04-14
+
+* Update actix-web alpha.6
+
+## [0.1.0-alpha.4] - 2019-04-08
+
+* Update actix-web
+
+## [0.1.0-alpha.3] - 2019-04-02
+
+* Update actix-web
+
+## [0.1.0-alpha.2] - 2019-03-29
+
+* Update actix-web
+
+* Use new feature name for secure cookies
+
+## [0.1.0-alpha.1] - 2019-03-28
+
+* Initial impl
--- a/actix-session/Cargo.toml
+++ b/actix-session/Cargo.toml
@ -0,0 +1,35 @@
+[package]
+name = "actix-session"
+version = "0.3.0"
+authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
+description = "Session for actix web framework."
+readme = "README.md"
+keywords = ["http", "web", "framework", "async", "futures"]
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-web.git"
+documentation = "https://docs.rs/actix-session/"
+license = "MIT/Apache-2.0"
+edition = "2018"
+
+[lib]
+name = "actix_session"
+path = "src/lib.rs"
+
+[features]
+default = ["cookie-session"]
+
+# sessions feature, session require "ring" crate and c compiler
+cookie-session = ["actix-web/secure-cookies"]
+
+[dependencies]
+actix-web = "2.0.0-rc"
+actix-service = "1.0.1"
+bytes = "0.5.3"
+derive_more = "0.99.2"
+futures = "0.3.1"
+serde = "1.0"
+serde_json = "1.0"
+time = "0.1.42"
+
+[dev-dependencies]
+actix-rt = "1.0.0"
--- a/actix-session/LICENSE-APACHE
+++ b/actix-session/LICENSE-APACHE
@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-session/LICENSE-MIT
+++ b/actix-session/LICENSE-MIT
@ -0,0 +1 @@
+../LICENSE-MIT
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yuki Okushi	d92d53a4f5	Merge pull request #1541 from JohnTitor/backport-files files: Bump up to 0.2.2	2020-05-27 00:37:29 +09:00
Yuki Okushi	55d79cc1b2	files: Bump up to 0.2.2	2020-05-26 17:22:16 +09:00
Yuki Okushi	a8117183bb	files: Minimize `futures` dependencies	2020-05-26 17:19:12 +09:00
Omid Rad	60dcfd1aff	Actix-files will always send SizedStream (#1496 ) * Fixes #1384 * There is no need to set no_chunking * Test content-length for static files * Update the tests * Add Changelog * Try to simply fix Windows test issues! Co-authored-by: Rob Ede <robjtede@icloud.com>	2020-05-26 17:18:47 +09:00
Yuki Okushi	7870165da2	Fix spelling error	2020-05-26 17:14:33 +09:00
Yuki Okushi	6560a2285f	Suppress warning	2020-05-26 17:13:35 +09:00
Yuki Okushi	12eccf40e1	Merge pull request #1539 from JohnTitor/framed-0.3.1 framed: Bump up to 0.3.1 with deprecation notice	2020-05-25 18:58:32 +09:00
Yuki Okushi	7a9c0f632d	framed: Bump up to 0.3.1 with deprecation notice	2020-05-25 18:20:55 +09:00
Yuki Okushi	7baa35a897	Merge pull request #1526 from actix/backport-gha 2.0: Tweak CI config	2020-05-21 15:04:28 +09:00
Yuki Okushi	ea0d748a5e	Remove Travis and AppVeyor config	2020-05-21 12:07:54 +09:00
Yuki Okushi	bc4f98321a	2.0: Tweak GHA config	2020-05-21 12:06:05 +09:00
Yuki Okushi	2ddbe2b15c	Merge pull request #1400 from JohnTitor/actions-2.0 [2.0 backport] Tweaks for GitHub Actions	2020-03-08 03:04:31 +09:00
Yuki Okushi	87378a7410	Demote lint level to warn	2020-03-08 02:23:55 +09:00
Yuki Okushi	ad0d809af6	Disable coverage for PRs	2020-03-08 02:03:08 +09:00
Yuki Okushi	7b00c16d44	Add some Actions workflows	2020-03-08 02:02:52 +09:00
Yuki Okushi	155a6db4cd	More ignore test causes timeout	2020-03-08 02:02:15 +09:00
Yuki Okushi	228e886986	Don't use cache in Windows CI (#1327 )	2020-03-08 02:01:59 +09:00
Yuki Okushi	4aa4b5f928	Tweak caches (#1319 ) * Try to use `cargo-cache` * Tweak issue template	2020-03-08 02:01:45 +09:00
cetra3	54ff97470e	Initial Issue template (#1311 ) * Initial Issue template * First round of changes for the bug report Co-authored-by: Yuki Okushi <huyuumi.dev@gmail.com>	2020-03-08 02:01:31 +09:00
Yuki Okushi	f02ad2913f	Fix vcpkg cache (#1312 )	2020-03-08 02:01:17 +09:00
Yuki Okushi	96b0dfeac3	Tweak actions (#1305 ) * Add benchmark action * Fix Windows build	2020-03-08 02:00:58 +09:00