diff --git a/examples/tls-server.rs b/examples/tls-server.rs index e31ba3a..f530dd8 100644 --- a/examples/tls-server.rs +++ b/examples/tls-server.rs @@ -3,8 +3,8 @@ use std::convert::TryFrom; use ntex::service::{fn_service, ServiceFactory}; use ntex_h2::{server, ControlMessage, Message, MessageKind, OperationError}; use ntex_http::{header, HeaderMap, StatusCode}; -use ntex_tls::openssl::Acceptor; -use openssl::ssl::{AlpnError, SslAcceptor, SslFiletype, SslMethod}; +use ntex_tls::openssl::SslAcceptor; +use openssl::ssl::{self, AlpnError, SslFiletype, SslMethod}; #[ntex::main] async fn main() -> std::io::Result<()> { @@ -14,7 +14,7 @@ async fn main() -> std::io::Result<()> { // create self-signed certificates using: // openssl req -x509 -nodes -subj '/CN=localhost' -newkey rsa:4096 -keyout examples/key8.pem -out examples/cert.pem -days 365 -keyform PEM // openssl rsa -in examples/key8.pem -out examples/key.pem - let mut builder = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap(); + let mut builder = ssl::SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap(); builder .set_private_key_file("./tests/key.pem", SslFiletype::PEM) .unwrap(); @@ -33,7 +33,7 @@ async fn main() -> std::io::Result<()> { ntex::server::Server::build() .bind("http", "127.0.0.1:5928", move |_| { - Acceptor::new(acceptor.clone()) + SslAcceptor::new(acceptor.clone()) .map_err(|_err| server::ServerError::Service(())) .and_then( server::Server::build() diff --git a/tests/connection.rs b/tests/connection.rs index 6b3f780..5c942a0 100644 --- a/tests/connection.rs +++ b/tests/connection.rs @@ -152,7 +152,7 @@ async fn test_max_concurrent_streams_pool() { .send(Method::GET, "/".into(), HeaderMap::default(), false) .await .unwrap(); - sleep(Millis(250)).await; + sleep(Millis(500)).await; assert!(!client.is_ready()); let client2 = client.clone();