1
0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 06:39:22 +02:00

tweak feature flags

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

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();

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,

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();