actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 06:39:22 +02:00
Code Issues Releases Wiki Activity

tweak feature flags

Browse Source
This commit is contained in:
Rob Ede
2021-02-07 03:54:58 +00:00
parent 830fb2cdb2
commit 9eaea6a2fd
16 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awc/Cargo.toml
View File

@ -28,10 +28,10 @@ features = ["openssl", "rustls", "compress"]
default = ["compress"]
# openssl
openssl = ["open-ssl", "actix-http/openssl"]
openssl = ["tls-openssl", "actix-http/openssl"]
# rustls
rustls = ["rust-tls", "actix-http/rustls"]
rustls = ["tls-rustls", "actix-http/rustls"]
# content-encoding support
compress = ["actix-http/compress"]
@ -54,8 +54,8 @@ rand = "0.8"
serde = "1.0"
serde_json = "1.0"
serde_urlencoded = "0.7"
open-ssl = { version = "0.10", package = "openssl", optional = true }
rust-tls = { version = "0.19.0", package = "rustls", optional = true, features = ["dangerous_configuration"] }
tls-openssl = { version = "0.10.9", package = "openssl", optional = true }
tls-rustls = { version = "0.19.0", package = "rustls", optional = true, features = ["dangerous_configuration"] }
[dev-dependencies]
actix-web = { version = "4.0.0-beta.1", features = ["openssl"] }
@ -68,6 +68,6 @@ actix-tls = { version = "3.0.0-beta.3", features = ["openssl", "rustls"] }
brotli2 = "0.3.2"
flate2 = "1.0.13"
futures-util = { version = "0.3.7", default-features = false }
env_logger = "0.7"
env_logger = "0.8"
rcgen = "0.8"
webpki = "0.21"

7
awc/tests/test_connector.rs
View File

@ -1,10 +1,13 @@
#![cfg(feature = "openssl")]
extern crate tls_openssl as openssl;
use actix_http::HttpService;
use actix_http_test::test_server;
use actix_service::{map_config, ServiceFactoryExt};
use actix_web::http::Version;
use actix_web::{dev::AppConfig, web, App, HttpResponse};
use open_ssl::ssl::{SslAcceptor, SslConnector, SslFiletype, SslMethod, SslVerifyMode};
use openssl::ssl::{SslAcceptor, SslConnector, SslFiletype, SslMethod, SslVerifyMode};
fn ssl_acceptor() -> SslAcceptor {
// load ssl keys
@ -20,7 +23,7 @@ fn ssl_acceptor() -> SslAcceptor {
if protos.windows(3).any(|window| window == H2) {
Ok(b"h2")
} else {
Err(open_ssl::ssl::AlpnError::NOACK)
Err(openssl::ssl::AlpnError::NOACK)
}
});
builder.set_alpn_protos(b"\x02h2").unwrap();

2
awc/tests/test_rustls_client.rs
View File

@ -1,6 +1,6 @@
#![cfg(feature = "rustls")]
extern crate rust_tls as rustls;
extern crate tls_rustls as rustls;
use std::{
io::BufReader,

7
awc/tests/test_ssl_client.rs
View File

@ -1,4 +1,7 @@
#![cfg(feature = "openssl")]
extern crate tls_openssl as openssl;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
@ -8,7 +11,7 @@ use actix_service::{map_config, pipeline_factory, ServiceFactoryExt};
use actix_web::http::Version;
use actix_web::{dev::AppConfig, web, App, HttpResponse};
use futures_util::future::ok;
use open_ssl::ssl::{SslAcceptor, SslConnector, SslFiletype, SslMethod, SslVerifyMode};
use openssl::ssl::{SslAcceptor, SslConnector, SslFiletype, SslMethod, SslVerifyMode};
fn ssl_acceptor() -> SslAcceptor {
// load ssl keys
@ -24,7 +27,7 @@ fn ssl_acceptor() -> SslAcceptor {
if protos.windows(3).any(|window| window == H2) {
Ok(b"h2")
} else {
Err(open_ssl::ssl::AlpnError::NOACK)
Err(openssl::ssl::AlpnError::NOACK)
}
});
builder.set_alpn_protos(b"\x02h2").unwrap();