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

disable rustls

Browse Source
This commit is contained in:
Nikolay Kim 2019-11-27 21:03:26 +06:00
parent af72005159
commit a02064592b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-connect/Cargo.toml
View File

@ -27,7 +27,7 @@ default = ["uri"]
openssl = ["open-ssl", "tokio-openssl"] openssl = ["open-ssl", "tokio-openssl"]
# rustls # rustls
rustls = ["rust-tls", "tokio-rustls", "webpki"] # rustls = ["rust-tls", "tokio-rustls", "webpki"]
# support http::Uri as connect address # support http::Uri as connect address
uri = ["http"] uri = ["http"]
@ -52,7 +52,7 @@ tokio-openssl = { version = "0.4.0-alpha.6", optional = true }
# rustls # rustls
rust-tls = { version = "0.16.0", package = "rustls", optional = true } rust-tls = { version = "0.16.0", package = "rustls", optional = true }
# tokio-rustls = { version = "0.10.0", optional = true } # tokio-rustls = { version = "0.10.0", optional = true }
tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true } # tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }
webpki = { version = "0.21", optional = true } webpki = { version = "0.21", optional = true }
[dev-dependencies] [dev-dependencies]

8
actix-server-config/Cargo.toml
View File

@ -14,16 +14,16 @@ name = "actix_server_config"
path = "src/lib.rs" path = "src/lib.rs"
[package.metadata.docs.rs] [package.metadata.docs.rs]
features = ["openssl", "rustls"] features = ["openssl"] #, "rustls"]
[features] [features]
default = [] default = []
openssl = ["tokio-openssl"] openssl = ["tokio-openssl"]
rustls = ["tokio-rustls"] # rustls = ["tokio-rustls"]
[dependencies] [dependencies]
actix-codec = "0.2.0-alpha.1" actix-codec = "0.2.0-alpha.1"
tokio-net = { version = "=0.2.0-alpha.6", features = ["tcp", "uds"] } tokio-net = { version = "=0.2.0-alpha.6", features = ["tcp", "uds"] }
tokio-openssl = { version = "0.4.0-alpha.6", optional = true } tokio-openssl = { version = "0.4.0-alpha.6", optional = true }
#tokio-rustls = { version = "0.12.0-alpha.8", optional = true } # tokio-rustls = { version = "0.12.0-alpha.8", optional = true }
tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true } # tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }

4
actix-server/Cargo.toml
View File

@ -24,7 +24,7 @@ path = "src/lib.rs"
default = [] default = []
nativetls = ["native-tls", "tokio-tls"] nativetls = ["native-tls", "tokio-tls"]
openssl = ["open-ssl", "tokio-openssl", "actix-server-config/openssl"] openssl = ["open-ssl", "tokio-openssl", "actix-server-config/openssl"]
rustls = ["rust-tls", "tokio-rustls", "webpki", "webpki-roots", "actix-server-config/rustls"] # rustls = ["rust-tls", "tokio-rustls", "webpki", "webpki-roots", "actix-server-config/rustls"]
[dependencies] [dependencies]
actix-service = "1.0.0-alpha.1" actix-service = "1.0.0-alpha.1"
@ -56,7 +56,7 @@ tokio-openssl = { version = "0.4.0-alpha.6", optional = true }
# rustls # rustls
rust-tls = { version = "0.16.0", package = "rustls", optional = true } rust-tls = { version = "0.16.0", package = "rustls", optional = true }
# tokio-rustls = { version = "0.12.0-alpha.2", optional = true } # tokio-rustls = { version = "0.12.0-alpha.2", optional = true }
tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true } # tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }
webpki = { version = "0.21", optional = true } webpki = { version = "0.21", optional = true }
webpki-roots = { version = "0.17", optional = true } webpki-roots = { version = "0.17", optional = true }