actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-30 17:44:34 +01:00
Code Issues Releases Wiki Activity

tokio 1.0 and mio 0.7 (#204)

Browse Source
This commit is contained in:
fakeshadow 2020-12-31 06:11:50 +08:00 committed by GitHub
parent b5eefb4d42
commit 647817ef14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -25,7 +25,3 @@ actix-tracing = { path = "actix-tracing" }
actix-utils = { path = "actix-utils" } actix-utils = { path = "actix-utils" }
actix-router = { path = "router" } actix-router = { path = "router" }
bytestring = { path = "string" } 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" }

4
actix-tls/Cargo.toml
View File

@ -56,8 +56,8 @@ http = { version = "0.2.2", optional = true }
log = "0.4" log = "0.4"
# resolver # resolver
trust-dns-proto = { 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-alpha.3", default-features = false, optional = true } trust-dns-resolver = { version = "0.20.0", default-features = false, optional = true }
# openssl # openssl
tls-openssl = { package = "openssl", version = "0.10", optional = true } tls-openssl = { package = "openssl", version = "0.10", optional = true }

6
actix-tls/src/accept/openssl.rs
View File

@ -84,10 +84,8 @@ where
} }
fn call(&mut self, io: T) -> Self::Future { fn call(&mut self, io: T) -> Self::Future {
let acc = self.acceptor.clone(); let ssl_ctx = self.acceptor.context();
let ssl_ctx = acc.into_context(); let ssl = Ssl::new(ssl_ctx).expect("Provided SSL acceptor was invalid.");
let ssl = Ssl::new(&ssl_ctx).expect("Provided SSL acceptor was invalid.");
AcceptorServiceResponse { AcceptorServiceResponse {
_guard: self.conns.get(), _guard: self.conns.get(),
stream: Some(SslStream::new(ssl, io).unwrap()), stream: Some(SslStream::new(ssl, io).unwrap()),

4
router/Cargo.toml
View File

@ -22,8 +22,8 @@ regex = "1.3.1"
serde = "1.0.104" serde = "1.0.104"
bytestring = "0.1.2" bytestring = "0.1.2"
log = "0.4.8" log = "0.4.8"
http = { version = "0.2.0", optional = true } http = { version = "0.2.2", optional = true }
[dev-dependencies] [dev-dependencies]
http = "0.2.0" http = "0.2.2"
serde_derive = "1.0" serde_derive = "1.0"

3
string/CHANGES.md
View File

@ -1,5 +1,8 @@
# Changes # Changes
## Unreleased - 2020-xx-xx
* Update `bytes` dependency to `1`
## [0.1.5] - 2020-03-30 ## [0.1.5] - 2020-03-30
* Serde support * Serde support