diff --git a/Cargo.toml b/Cargo.toml index 6aa6d60e7..add1e9ac3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -140,8 +140,8 @@ actix-tls = { git = "https://github.com/fakeshadow/actix-net.git", branch = "mio actix-connect = { git = "https://github.com/fakeshadow/actix-net.git", branch = "mio-0.7.3" } actix-utils = { git = "https://github.com/fakeshadow/actix-net.git", branch = "mio-0.7.3" } actix-codec = { git = "https://github.com/fakeshadow/actix-net.git", branch = "mio-0.7.3" } +h2 = { git = "https://github.com/hyperium/h2.git" } http = { git = "https://github.com/paolobarbolini/http.git", branch = "bytes06" } -h2 = { git = "https://github.com/paolobarbolini/h2", branch = "bytes06" } [[bench]] name = "server" diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index 571ed2a0a..2d725348f 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -62,12 +62,8 @@ futures-core = { version = "0.3.5", default-features = false } futures-util = { version = "0.3.5", default-features = false } fxhash = "0.2.1" -#h2 = "0.2.7" -#http = "0.2.0" -# FIXME: Use release version -http = { git = "https://github.com/paolobarbolini/http.git", branch = "bytes06" } -h2 = { git = "https://github.com/paolobarbolini/h2", branch = "bytes06" } - +h2 = "0.3.0" +http = "0.2.1" httparse = "1.3" indexmap = "1.3" itoa = "0.4" diff --git a/actix-http/src/header/shared/httpdate.rs b/actix-http/src/header/shared/httpdate.rs index d2e08bc51..d6b9d8001 100644 --- a/actix-http/src/header/shared/httpdate.rs +++ b/actix-http/src/header/shared/httpdate.rs @@ -3,7 +3,8 @@ use std::io::Write; use std::str::FromStr; use std::time::{SystemTime, UNIX_EPOCH}; -use bytes::{buf::BufMut, BytesMut}; +use bytes::buf::BufMut; +use bytes::BytesMut; use http::header::{HeaderValue, InvalidHeaderValue}; use time::{offset, OffsetDateTime, PrimitiveDateTime}; diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index fe7cb8fd6..8bf30740c 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -39,7 +39,7 @@ actix-testing = "1.0.0" awc = "2.0.0" base64 = "0.13" -bytes = "0.6" +bytes = "0.5" futures-core = { version = "0.3.5", default-features = false } http = "0.2.0" log = "0.4"