actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-27 07:19:05 +02:00
Code Issues Releases Wiki Activity

fix actix-tls tests (#241)

Browse Source
This commit is contained in:
fakeshadow
2020-12-29 19:36:17 +08:00
committed by GitHub
parent 0934078947
commit 03eb96d6d4
12 changed files with 291 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
actix-tls/Cargo.toml
View File

@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
edition = "2018"
[package.metadata.docs.rs]
features = ["openssl", "rustls", "native-tls", "accept", "connect", "http"]
features = ["openssl", "rustls", "native-tls", "accept", "connect", "uri"]
[lib]
name = "actix_tls"
@ -23,13 +23,13 @@ name = "basic"
required-features = ["accept", "rustls"]
[features]
default = ["accept", "connect", "http"]
default = ["accept", "connect", "uri"]
# enable acceptor services
accept = []
# enable connector services
connect = []
connect = ["trust-dns-proto/tokio-runtime", "trust-dns-resolver/tokio-runtime", "trust-dns-resolver/system-config"]
# use openssl impls
openssl = ["tls-openssl", "tokio-openssl"]
@ -40,6 +40,9 @@ rustls = ["tls-rustls", "webpki", "webpki-roots", "tokio-rustls"]
# use native-tls impls
native-tls = ["tls-native-tls", "tokio-native-tls"]
# support http::Uri as connect address
uri = ["http"]
[dependencies]
actix-codec = "0.4.0-beta.1"
actix-rt = "2.0.0-beta.1"
@ -49,10 +52,12 @@ actix-utils = "3.0.0-beta.1"
derive_more = "0.99.5"
either = "1.6"
futures-util = { version = "0.3.7", default-features = false }
http = { version = "0.2.0", optional = true }
http = { version = "0.2.2", optional = true }
log = "0.4"
trust-dns-proto = { version = "0.19", default-features = false, features = ["tokio-runtime"] }
trust-dns-resolver = { version = "0.19", default-features = false, features = ["tokio-runtime", "system-config"] }
# 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 }
# openssl
tls-openssl = { package = "openssl", version = "0.10", optional = true }
@ -74,5 +79,6 @@ tokio-native-tls = { version = "0.3", optional = true }
actix-server = "2.0.0-beta.1"
actix-testing = "2.0.0-beta.1"
bytes = "1"
log = "0.4"
env_logger = "0.8"
futures-util = { version = "0.3.7", default-features = false, features = ["sink"] }
log = "0.4"