diff --git a/Cargo.toml b/Cargo.toml index 99cde3e1..4f51cef3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,6 +30,5 @@ actix-utils = { path = "actix-utils" } actix-router = { path = "router" } bytestring = { path = "string" } -# FIXME: remove these overrides -tokio = { git = "https://github.com/tokio-rs/tokio.git" } -tokio-util = { git = "https://github.com/tokio-rs/tokio.git" } \ No newline at end of file +#FIXME: remove override +http = { git = "https://github.com/fakeshadow/http.git" } diff --git a/actix-connect/Cargo.toml b/actix-connect/Cargo.toml index ca57c1b7..808e6b07 100644 --- a/actix-connect/Cargo.toml +++ b/actix-connect/Cargo.toml @@ -39,8 +39,8 @@ actix-rt = "1.1.1" derive_more = "0.99.2" either = "1.5.3" futures-util = { version = "0.3.4", default-features = false } -# FIXME: Use release version -http = { git = "https://github.com/fakeshadow/http.git", optional = true } +# FIXME: update to 0.3 +http = { version = "0.2.2", optional = true } log = "0.4" # FIXME: Use release version trust-dns-proto = { git = "https://github.com/bluejekyll/trust-dns", branch = "main", default-features = false, features = ["tokio-runtime"] } diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md index 8fd1a32c..3e6221f3 100644 --- a/actix-rt/CHANGES.md +++ b/actix-rt/CHANGES.md @@ -7,7 +7,7 @@ * Add `System::attach_to_tokio` method. [#173] ### Changed -* Update `tokio` dependency to 0.3.1 +* Update `tokio` dependency to `1` * Rename `time` module `delay_for` to `sleep`, `delay_until` to `sleep_until`, `Delay` to `Sleep` to keep inline with tokio. * Remove `'static` lifetime requirement for `Runtime::block_on` and `SystemRunner::block_on`. These methods would accept a &Self when calling. * Remove `'static` lifetime requirement for `System::run` diff --git a/actix-utils/CHANGES.md b/actix-utils/CHANGES.md index fb02ddbb..1f09732d 100644 --- a/actix-utils/CHANGES.md +++ b/actix-utils/CHANGES.md @@ -2,7 +2,7 @@ ## Unreleased - 2020-xx-xx * Upgrade `pin-project` to `1.0`. -* Update `bytes` dependency to 0.6. +* Update `bytes` dependency to `1`. ## 2.0.0 - 2020-08-23 * No changes from beta 1. diff --git a/router/Cargo.toml b/router/Cargo.toml index fe553e27..6fc6ecc8 100644 --- a/router/Cargo.toml +++ b/router/Cargo.toml @@ -22,8 +22,8 @@ regex = "1.3.1" serde = "1.0.104" bytestring = "0.1.2" log = "0.4.8" -http = { version = "0.2.0", optional = true } +http = { version = "0.2.2", optional = true } [dev-dependencies] -http = "0.2.0" +http = "0.2.2" serde_derive = "1.0"