From 56b9f11c981f532556916b54205de2f5fc173fa7 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Wed, 27 Nov 2019 21:07:49 +0600 Subject: [PATCH] disable rustls --- Cargo.toml | 4 ++-- actix-http/Cargo.toml | 9 +++++---- awc/Cargo.toml | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a1875eb7..02e4ac0a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,7 +66,7 @@ fail = ["actix-http/fail"] openssl = ["open-ssl", "actix-server/openssl", "awc/openssl"] # rustls -rustls = ["rust-tls", "actix-server/rustls", "awc/rustls"] +# rustls = ["rust-tls", "actix-server/rustls", "awc/rustls"] [dependencies] actix-codec = "0.2.0-alpha.1" @@ -101,7 +101,7 @@ url = "2.1" # ssl support open-ssl = { version="0.10", package="openssl", optional = true } -rust-tls = { version = "0.16", package="rustls", optional = true } +# rust-tls = { version = "0.16", package="rustls", optional = true } [dev-dependencies] # actix = "0.8.3" diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index cfed0bf1..9a14abef 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -29,7 +29,7 @@ default = [] openssl = ["open-ssl", "actix-connect/openssl", "tokio-openssl"] # rustls support -rustls = ["rust-tls", "webpki-roots", "actix-connect/rustls"] +# rustls = ["rust-tls", "webpki-roots", "actix-connect/rustls"] # brotli encoding, requires c compiler brotli = ["brotli2"] @@ -99,11 +99,12 @@ failure = { version = "0.1.5", optional = true } open-ssl = { version="0.10", package="openssl", optional = true } tokio-openssl = { version = "0.4.0-alpha.6", optional = true } -rust-tls = { version = "0.16.0", package="rustls", optional = true } -webpki-roots = { version = "0.18", optional = true } +# rust-tls = { version = "0.16.0", package="rustls", optional = true } +# webpki-roots = { version = "0.18", optional = true } [dev-dependencies] -actix-server = { version = "0.8.0-alpha.1", features=["openssl", "rustls"] } +#actix-server = { version = "0.8.0-alpha.1", features=["openssl", "rustls"] } +actix-server = { version = "0.8.0-alpha.1", features=["openssl"] } actix-connect = { version = "1.0.0-alpha.1", features=["openssl"] } actix-http-test = { version = "0.3.0-alpha.1", features=["openssl"] } env_logger = "0.6" diff --git a/awc/Cargo.toml b/awc/Cargo.toml index 1b35c279..e9268aac 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -30,7 +30,7 @@ default = ["brotli", "flate2-zlib"] openssl = ["open-ssl", "actix-http/openssl"] # rustls -rustls = ["rust-tls", "actix-http/rustls"] +# rustls = ["rust-tls", "actix-http/rustls"] # brotli encoding, requires c compiler brotli = ["actix-http/brotli"] @@ -59,7 +59,7 @@ serde = "1.0" serde_json = "1.0" serde_urlencoded = "0.6.1" open-ssl = { version="0.10", package="openssl", optional = true } -rust-tls = { version = "0.16.0", package="rustls", optional = true, features = ["dangerous_configuration"] } +# rust-tls = { version = "0.16.0", package="rustls", optional = true, features = ["dangerous_configuration"] } [dev-dependencies] actix-connect = { version = "1.0.0-alpha.1", features=["openssl"] }