diff --git a/Cargo.toml b/Cargo.toml index 17d1c857..13fc843e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,3 @@ actix-tracing = { path = "actix-tracing" } actix-utils = { path = "actix-utils" } actix-router = { path = "router" } bytestring = { path = "string" } - -# FIXME: remove override -trust-dns-proto = { git = "https://github.com/bluejekyll/trust-dns.git", branch = "main" } -trust-dns-resolver = { git = "https://github.com/bluejekyll/trust-dns.git", branch = "main" } \ No newline at end of file diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 2905fd5a..017f17fe 100644 --- a/actix-tls/Cargo.toml +++ b/actix-tls/Cargo.toml @@ -56,8 +56,8 @@ http = { version = "0.2.2", optional = true } log = "0.4" # resolver -trust-dns-proto = { version = "0.20.0-alpha.3", default-features = false, optional = true } -trust-dns-resolver = { version = "0.20.0-alpha.3", default-features = false, optional = true } +trust-dns-proto = { version = "0.20.0", default-features = false, optional = true } +trust-dns-resolver = { version = "0.20.0", default-features = false, optional = true } # openssl tls-openssl = { package = "openssl", version = "0.10", optional = true } diff --git a/actix-tls/src/accept/openssl.rs b/actix-tls/src/accept/openssl.rs index e51808a3..efda5c38 100644 --- a/actix-tls/src/accept/openssl.rs +++ b/actix-tls/src/accept/openssl.rs @@ -84,10 +84,8 @@ where } fn call(&mut self, io: T) -> Self::Future { - let acc = self.acceptor.clone(); - let ssl_ctx = acc.into_context(); - let ssl = Ssl::new(&ssl_ctx).expect("Provided SSL acceptor was invalid."); - + let ssl_ctx = self.acceptor.context(); + let ssl = Ssl::new(ssl_ctx).expect("Provided SSL acceptor was invalid."); AcceptorServiceResponse { _guard: self.conns.get(), stream: Some(SslStream::new(ssl, io).unwrap()), 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" diff --git a/string/CHANGES.md b/string/CHANGES.md index 030c3cd5..e66f81cd 100644 --- a/string/CHANGES.md +++ b/string/CHANGES.md @@ -1,5 +1,8 @@ # Changes +## Unreleased - 2020-xx-xx +* Update `bytes` dependency to `1` + ## [0.1.5] - 2020-03-30 * Serde support