prepare for actix-tls rc.1 (#2474)

CHANGES.md

@@ -3,6 +3,13 @@
 ## Unreleased - 2021-xx-xx
 
 
+## 4.0.0-beta.13 - 2021-11-30
+### Changed
+* Update `actix-tls` to `3.0.0-rc.1`. [#2474]
+
+[#2474]: https://github.com/actix/actix-web/pull/2474
+
+
 ## 4.0.0-beta.12 - 2021-11-22
 ### Changed
 * Compress middleware's response type is now `AnyBody<Encoder<B>>`. [#2448]

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "4.0.0-beta.12"
+version = "4.0.0-beta.13"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
 keywords = ["actix", "http", "web", "framework", "async"]
@@ -75,9 +75,9 @@ actix-rt = "2.3"
 actix-server = "2.0.0-beta.9"
 actix-service = "2.0.0"
 actix-utils = "3.0.0"
-actix-tls = { version = "3.0.0-beta.9", default-features = false, optional = true }
+actix-tls = { version = "3.0.0-rc.1", default-features = false, optional = true }
 
-actix-http = "3.0.0-beta.13"
+actix-http = "3.0.0-beta.14"
 actix-router = "0.5.0-beta.2"
 actix-web-codegen = "0.5.0-beta.5"
 
@@ -143,6 +143,15 @@ actix-web-actors = { path = "actix-web-actors" }
 actix-web-codegen = { path = "actix-web-codegen" }
 awc = { path = "awc" }
 
+# uncomment for quick testing against local actix-net repo
+# actix-service = { path = "../actix-net/actix-service" }
+# actix-macros = { path = "../actix-net/actix-macros" }
+# actix-rt = { path = "../actix-net/actix-rt" }
+# actix-codec = { path = "../actix-net/actix-codec" }
+# actix-utils = { path = "../actix-net/actix-utils" }
+# actix-tls = { path = "../actix-net/actix-tls" }
+# actix-server = { path = "../actix-net/actix-server" }
+
 [[test]]
 name = "test_server"
 required-features = ["compress-brotli", "compress-gzip", "compress-zstd", "cookies"]

README.md

@@ -6,10 +6,10 @@
   <p>
 
 [![crates.io](https://img.shields.io/crates/v/actix-web?label=latest)](https://crates.io/crates/actix-web)
-[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.0.0-beta.12)](https://docs.rs/actix-web/4.0.0-beta.12)
+[![Documentation](https://docs.rs/actix-web/badge.svg?version=4.0.0-beta.13)](https://docs.rs/actix-web/4.0.0-beta.13)
 [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-web.svg)
-[![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-beta.12/status.svg)](https://deps.rs/crate/actix-web/4.0.0-beta.12)
+[![Dependency Status](https://deps.rs/crate/actix-web/4.0.0-beta.13/status.svg)](https://deps.rs/crate/actix-web/4.0.0-beta.13)
 <br />
 [![build status](https://github.com/actix/actix-web/workflows/CI%20%28Linux%29/badge.svg?branch=master&event=push)](https://github.com/actix/actix-web/actions)
 [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) 

actix-files/Cargo.toml

@@ -23,7 +23,7 @@ experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
 
 [dependencies]
 actix-web = { version = "4.0.0-beta.11", default-features = false }
-actix-http = "3.0.0-beta.13"
+actix-http = "3.0.0-beta.14"
 actix-service = "2"
 actix-utils = "3"
 

actix-http-test/CHANGES.md

@@ -3,6 +3,12 @@
 ## Unreleased - 2021-xx-xx
 
 
+## 3.0.0-beta.8 - 2021-11-30
+* Update `actix-tls` to `3.0.0-rc.1`. [#2474]
+
+[#2474]: https://github.com/actix/actix-web/pull/2474
+
+
 ## 3.0.0-beta.7 - 2021-11-22
 * Fix compatibility with experimental `io-uring` feature of `actix-rt`. [#2408]
 

actix-http-test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http-test"
-version = "3.0.0-beta.7"
+version = "3.0.0-beta.8"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Various helpers for Actix applications to use during testing"
 keywords = ["http", "web", "framework", "async", "futures"]
@@ -31,7 +31,7 @@ openssl = ["tls-openssl", "awc/openssl"]
 [dependencies]
 actix-service = "2.0.0"
 actix-codec = "0.4.1"
-actix-tls = "3.0.0-beta.9"
+actix-tls = "3.0.0-rc.1"
 actix-utils = "3.0.0"
 actix-rt = "2.2"
 actix-server = "2.0.0-beta.9"
@@ -52,4 +52,4 @@ tokio = { version = "1.2", features = ["sync"] }
 
 [dev-dependencies]
 actix-web = { version = "4.0.0-beta.11", default-features = false, features = ["cookies"] }
-actix-http = "3.0.0-beta.13"
+actix-http = "3.0.0-beta.14"

actix-http-test/README.md

@@ -3,11 +3,11 @@
 > Various helpers for Actix applications to use during testing.
 
 [![crates.io](https://img.shields.io/crates/v/actix-http-test?label=latest)](https://crates.io/crates/actix-http-test)
-[![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.0.0-beta.7)](https://docs.rs/actix-http-test/3.0.0-beta.7)
+[![Documentation](https://docs.rs/actix-http-test/badge.svg?version=3.0.0-beta.8)](https://docs.rs/actix-http-test/3.0.0-beta.8)
 [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http-test)
 <br>
-[![Dependency Status](https://deps.rs/crate/actix-http-test/3.0.0-beta.7/status.svg)](https://deps.rs/crate/actix-http-test/3.0.0-beta.7)
+[![Dependency Status](https://deps.rs/crate/actix-http-test/3.0.0-beta.8/status.svg)](https://deps.rs/crate/actix-http-test/3.0.0-beta.8)
 [![Download](https://img.shields.io/crates/d/actix-http-test.svg)](https://crates.io/crates/actix-http-test)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

actix-http/CHANGES.md

@@ -1,13 +1,18 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+
+
+## 3.0.0-beta.14 - 2021-11-30
 ### Changed
 * Guarantee ordering of `header::GetAll` iterator to be same as insertion order. [#2467]
 * Expose `header::map` module. [#2467]
 * Implement `ExactSizeIterator` and `FusedIterator` for all `HeaderMap` iterators. [#2470]
+* Update `actix-tls` to `3.0.0-rc.1`. [#2474]
 
 [#2467]: https://github.com/actix/actix-web/pull/2467
 [#2470]: https://github.com/actix/actix-web/pull/2470
+[#2474]: https://github.com/actix/actix-web/pull/2474
 
 
 ## 3.0.0-beta.13 - 2021-11-22

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "3.0.0-beta.13"
+version = "3.0.0-beta.14"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "HTTP primitives for the Actix ecosystem"
 keywords = ["actix", "http", "framework", "async", "futures"]
@@ -73,7 +73,7 @@ sha-1 = "0.9"
 smallvec = "1.6.1"
 
 # tls
-actix-tls = { version = "3.0.0-beta.9", default-features = false, optional = true }
+actix-tls = { version = "3.0.0-rc.1", default-features = false, optional = true }
 
 # compression
 brotli2 = { version="0.3.2", optional = true }
@@ -83,7 +83,7 @@ zstd = { version = "0.9", optional = true }
 [dev-dependencies]
 actix-server = "2.0.0-beta.9"
 actix-http-test = { version = "3.0.0-beta.7", features = ["openssl"] }
-actix-tls = { version = "3.0.0-beta.9", features = ["openssl"] }
+actix-tls = { version = "3.0.0-rc.1", features = ["openssl"] }
 async-stream = "0.3"
 criterion = { version = "0.3", features = ["html_reports"] }
 env_logger = "0.9"

actix-http/README.md

@@ -3,11 +3,11 @@
 > HTTP primitives for the Actix ecosystem.
 
 [![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http)
-[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.0.0-beta.13)](https://docs.rs/actix-http/3.0.0-beta.13)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.0.0-beta.14)](https://docs.rs/actix-http/3.0.0-beta.14)
 [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-http/3.0.0-beta.13/status.svg)](https://deps.rs/crate/actix-http/3.0.0-beta.13)
+[![dependency status](https://deps.rs/crate/actix-http/3.0.0-beta.14/status.svg)](https://deps.rs/crate/actix-http/3.0.0-beta.14)
 [![Download](https://img.shields.io/crates/d/actix-http.svg)](https://crates.io/crates/actix-http)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

actix-http/src/h1/service.rs

@@ -103,7 +103,10 @@ mod openssl {
     use super::*;
 
     use actix_tls::accept::{
-        openssl::{Acceptor, SslAcceptor, SslError, TlsStream},
+        openssl::{
+            reexports::{Error as SslError, SslAcceptor},
+            Acceptor, TlsStream,
+        },
         TlsError,
     };
 
@@ -164,7 +167,7 @@ mod rustls {
 
     use actix_service::ServiceFactoryExt as _;
     use actix_tls::accept::{
-        rustls::{Acceptor, ServerConfig, TlsStream},
+        rustls::{reexports::ServerConfig, Acceptor, TlsStream},
         TlsError,
     };
 

actix-http/src/h2/service.rs

@@ -103,7 +103,10 @@ where
 mod openssl {
     use actix_service::ServiceFactoryExt as _;
     use actix_tls::accept::{
-        openssl::{Acceptor, SslAcceptor, SslError, TlsStream},
+        openssl::{
+            reexports::{Error as SslError, SslAcceptor},
+            Acceptor, TlsStream,
+        },
         TlsError,
     };
 
@@ -151,7 +154,7 @@ mod rustls {
 
     use actix_service::ServiceFactoryExt as _;
     use actix_tls::accept::{
-        rustls::{Acceptor, ServerConfig, TlsStream},
+        rustls::{reexports::ServerConfig, Acceptor, TlsStream},
         TlsError,
     };
 

actix-http/src/service.rs

@@ -197,7 +197,10 @@ where
 mod openssl {
     use actix_service::ServiceFactoryExt as _;
     use actix_tls::accept::{
-        openssl::{Acceptor, SslAcceptor, SslError, TlsStream},
+        openssl::{
+            reexports::{Error as SslError, SslAcceptor},
+            Acceptor, TlsStream,
+        },
         TlsError,
     };
 
@@ -270,7 +273,7 @@ mod rustls {
 
     use actix_service::ServiceFactoryExt as _;
     use actix_tls::accept::{
-        rustls::{Acceptor, ServerConfig, TlsStream},
+        rustls::{reexports::ServerConfig, Acceptor, TlsStream},
         TlsError,
     };
 

actix-http/tests/test_rustls.rs

@@ -20,7 +20,7 @@ use actix_http::{
 };
 use actix_http_test::test_server;
 use actix_service::{fn_factory_with_config, fn_service};
-use actix_tls::connect::tls::rustls::webpki_roots_cert_store;
+use actix_tls::connect::rustls::webpki_roots_cert_store;
 use actix_utils::future::{err, ok};
 use bytes::{Bytes, BytesMut};
 use derive_more::{Display, Error};

actix-multipart/Cargo.toml

@@ -28,7 +28,7 @@ twoway = "0.2"
 
 [dev-dependencies]
 actix-rt = "2.2"
-actix-http = "3.0.0-beta.13"
+actix-http = "3.0.0-beta.14"
 futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
 tokio = { version = "1", features = ["sync"] }
 tokio-stream = "0.1"

actix-test/Cargo.toml

@@ -29,7 +29,7 @@ openssl = ["tls-openssl", "actix-http/openssl", "awc/openssl"]
 
 [dependencies]
 actix-codec = "0.4.1"
-actix-http = "3.0.0-beta.13"
+actix-http = "3.0.0-beta.14"
 actix-http-test = "3.0.0-beta.7"
 actix-service = "2.0.0"
 actix-utils = "3.0.0"

actix-web-actors/Cargo.toml

@@ -16,7 +16,7 @@ path = "src/lib.rs"
 [dependencies]
 actix = { version = "0.12.0", default-features = false }
 actix-codec = "0.4.1"
-actix-http = "3.0.0-beta.13"
+actix-http = "3.0.0-beta.14"
 actix-web = { version = "4.0.0-beta.11", default-features = false }
 
 bytes = "1"

awc/CHANGES.md

@@ -3,6 +3,12 @@
 ## Unreleased - 2021-xx-xx
 
 
+## 3.0.0-beta.12 - 2021-11-30
+* Update `actix-tls` to `3.0.0-rc.1`. [#2474]
+
+[#2474]: https://github.com/actix/actix-web/pull/2474
+
+
 ## 3.0.0-beta.11 - 2021-11-22
 * No significant changes from `3.0.0-beta.10`.
 

awc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "3.0.0-beta.11"
+version = "3.0.0-beta.12"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "fakeshadow <24548779@qq.com>",
@@ -60,9 +60,9 @@ dangerous-h2c = []
 [dependencies]
 actix-codec = "0.4.1"
 actix-service = "2.0.0"
-actix-http = "3.0.0-beta.13"
+actix-http = "3.0.0-beta.14"
 actix-rt = { version = "2.1", default-features = false }
-actix-tls = { version = "3.0.0-beta.9", features = ["connect"] }
+actix-tls = { version = "3.0.0-rc.1", features = ["connect", "uri"] }
 actix-utils = "3.0.0"
 
 ahash = "0.7"
@@ -94,11 +94,11 @@ trust-dns-resolver = { version = "0.20.0", optional = true }
 
 [dev-dependencies]
 actix-web = { version = "4.0.0-beta.11", features = ["openssl"] }
-actix-http = { version = "3.0.0-beta.13", features = ["openssl"] }
+actix-http = { version = "3.0.0-beta.14", features = ["openssl"] }
 actix-http-test = { version = "3.0.0-beta.7", features = ["openssl"] }
 actix-utils = "3.0.0"
 actix-server = "2.0.0-beta.9"
-actix-tls = { version = "3.0.0-beta.9", features = ["openssl", "rustls"] }
+actix-tls = { version = "3.0.0-rc.1", features = ["openssl", "rustls"] }
 actix-test = { version = "0.1.0-beta.7", features = ["openssl", "rustls"] }
 
 brotli2 = "0.3.2"

awc/README.md

@@ -3,9 +3,9 @@
 > Async HTTP and WebSocket client library.
 
 [![crates.io](https://img.shields.io/crates/v/awc?label=latest)](https://crates.io/crates/awc)
-[![Documentation](https://docs.rs/awc/badge.svg?version=3.0.0-beta.11)](https://docs.rs/awc/3.0.0-beta.11)
+[![Documentation](https://docs.rs/awc/badge.svg?version=3.0.0-beta.12)](https://docs.rs/awc/3.0.0-beta.12)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/awc)
-[![Dependency Status](https://deps.rs/crate/awc/3.0.0-beta.11/status.svg)](https://deps.rs/crate/awc/3.0.0-beta.11)
+[![Dependency Status](https://deps.rs/crate/awc/3.0.0-beta.12/status.svg)](https://deps.rs/crate/awc/3.0.0-beta.12)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 
 ## Documentation & Resources

awc/src/builder.rs

@@ -5,7 +5,7 @@ use actix_rt::net::{ActixStream, TcpStream};
 use actix_service::{boxed, Service};
 
 use crate::{
-    client::{Connector, ConnectorService, TcpConnect, TcpConnectError, TcpConnection},
+    client::{ConnectInfo, Connector, ConnectorService, TcpConnectError, TcpConnection},
     connect::DefaultConnector,
     error::SendRequestError,
     middleware::{NestTransform, Redirect, Transform},
@@ -33,7 +33,7 @@ impl ClientBuilder {
     #[allow(clippy::new_ret_no_self)]
     pub fn new() -> ClientBuilder<
         impl Service<
-                TcpConnect<Uri>,
+                ConnectInfo<Uri>,
                 Response = TcpConnection<Uri, TcpStream>,
                 Error = TcpConnectError,
             > + Clone,
@@ -56,7 +56,7 @@ impl ClientBuilder {
 
 impl<S, Io, M> ClientBuilder<S, M>
 where
-    S: Service<TcpConnect<Uri>, Response = TcpConnection<Uri, Io>, Error = TcpConnectError>
+    S: Service<ConnectInfo<Uri>, Response = TcpConnection<Uri, Io>, Error = TcpConnectError>
         + Clone
         + 'static,
     Io: ActixStream + fmt::Debug + 'static,
@@ -65,7 +65,7 @@ where
     pub fn connector<S1, Io1>(self, connector: Connector<S1>) -> ClientBuilder<S1, M>
     where
         S1: Service<
-                TcpConnect<Uri>,
+                ConnectInfo<Uri>,
                 Response = TcpConnection<Uri, Io1>,
                 Error = TcpConnectError,
             > + Clone

awc/src/client/connector.rs

@@ -15,8 +15,8 @@ use actix_rt::{
 };
 use actix_service::Service;
 use actix_tls::connect::{
-    new_connector, Connect as TcpConnect, ConnectError as TcpConnectError,
+    ConnectError as TcpConnectError, ConnectInfo, Connection as TcpConnection,
-    Connection as TcpConnection, Resolver,
+    Connector as TcpConnector, Resolver,
 };
 use futures_core::{future::LocalBoxFuture, ready};
 use http::Uri;
@@ -28,13 +28,15 @@ use super::error::ConnectError;
 use super::pool::ConnectionPool;
 use super::Connect;
 
-enum SslConnector {
+enum OurTlsConnector {
-    #[allow(dead_code)]
+    #[allow(dead_code)] // only dead when no TLS feature is enabled
     None,
+
     #[cfg(feature = "openssl")]
-    Openssl(actix_tls::connect::ssl::openssl::SslConnector),
+    Openssl(actix_tls::connect::openssl::reexports::SslConnector),
+
     #[cfg(feature = "rustls")]
-    Rustls(std::sync::Arc<actix_tls::connect::ssl::rustls::ClientConfig>),
+    Rustls(std::sync::Arc<actix_tls::connect::rustls::reexports::ClientConfig>),
 }
 
 /// Manages HTTP client network connectivity.
@@ -53,21 +55,22 @@ enum SslConnector {
 pub struct Connector<T> {
     connector: T,
     config: ConnectorConfig,
-    #[allow(dead_code)]
+
-    ssl: SslConnector,
+    #[allow(dead_code)] // only dead when no TLS feature is enabled
+    ssl: OurTlsConnector,
 }
 
 impl Connector<()> {
     #[allow(clippy::new_ret_no_self, clippy::let_unit_value)]
     pub fn new() -> Connector<
         impl Service<
-                TcpConnect<Uri>,
+                ConnectInfo<Uri>,
                 Response = TcpConnection<Uri, TcpStream>,
                 Error = actix_tls::connect::ConnectError,
             > + Clone,
     > {
         Connector {
-            connector: new_connector(resolver::resolver()),
+            connector: TcpConnector::new(resolver::resolver()).service(),
             config: ConnectorConfig::default(),
             ssl: Self::build_ssl(vec![b"h2".to_vec(), b"http/1.1".to_vec()]),
         }
@@ -75,16 +78,16 @@ impl Connector<()> {
 
     /// Provides an empty TLS connector when no TLS feature is enabled.
     #[cfg(not(any(feature = "openssl", feature = "rustls")))]
-    fn build_ssl(_: Vec<Vec<u8>>) -> SslConnector {
+    fn build_ssl(_: Vec<Vec<u8>>) -> OurTlsConnector {
-        SslConnector::None
+        OurTlsConnector::None
     }
 
     /// Build TLS connector with rustls, based on supplied ALPN protocols
     ///
     /// Note that if both `openssl` and `rustls` features are enabled, rustls will be used.
     #[cfg(feature = "rustls")]
-    fn build_ssl(protocols: Vec<Vec<u8>>) -> SslConnector {
+    fn build_ssl(protocols: Vec<Vec<u8>>) -> OurTlsConnector {
-        use actix_tls::connect::tls::rustls::{webpki_roots_cert_store, ClientConfig};
+        use actix_tls::connect::rustls::{reexports::ClientConfig, webpki_roots_cert_store};
 
         let mut config = ClientConfig::builder()
             .with_safe_defaults()
@@ -93,13 +96,13 @@ impl Connector<()> {
 
         config.alpn_protocols = protocols;
 
-        SslConnector::Rustls(std::sync::Arc::new(config))
+        OurTlsConnector::Rustls(std::sync::Arc::new(config))
     }
 
     /// Build TLS connector with openssl, based on supplied ALPN protocols
     #[cfg(all(feature = "openssl", not(feature = "rustls")))]
-    fn build_ssl(protocols: Vec<Vec<u8>>) -> SslConnector {
+    fn build_ssl(protocols: Vec<Vec<u8>>) -> OurTlsConnector {
-        use actix_tls::connect::tls::openssl::{SslConnector as OpensslConnector, SslMethod};
+        use actix_tls::connect::openssl::reexports::{SslConnector, SslMethod};
         use bytes::{BufMut, BytesMut};
 
         let mut alpn = BytesMut::with_capacity(20);
@@ -108,12 +111,12 @@ impl Connector<()> {
             alpn.put(proto.as_slice());
         }
 
-        let mut ssl = OpensslConnector::builder(SslMethod::tls()).unwrap();
+        let mut ssl = SslConnector::builder(SslMethod::tls()).unwrap();
         if let Err(err) = ssl.set_alpn_protos(&alpn) {
             log::error!("Can not set ALPN protocol: {:?}", err);
         }
 
-        SslConnector::Openssl(ssl.build())
+        OurTlsConnector::Openssl(ssl.build())
     }
 }
 
@@ -123,7 +126,7 @@ impl<S> Connector<S> {
     where
         Io1: ActixStream + fmt::Debug + 'static,
         S1: Service<
-                TcpConnect<Uri>,
+                ConnectInfo<Uri>,
                 Response = TcpConnection<Uri, Io1>,
                 Error = TcpConnectError,
             > + Clone,
@@ -136,7 +139,7 @@ impl<S> Connector<S> {
     }
 }
 
-impl<S, Io> Connector<S>
+impl<S, IO> Connector<S>
 where
     // Note:
     // Input Io type is bound to ActixStream trait but internally in client module they
@@ -145,8 +148,8 @@ where
     //
     // This remap is to hide ActixStream's trait methods. They are not meant to be called
     // from user code.
-    Io: ActixStream + fmt::Debug + 'static,
+    IO: ActixStream + fmt::Debug + 'static,
-    S: Service<TcpConnect<Uri>, Response = TcpConnection<Uri, Io>, Error = TcpConnectError>
+    S: Service<ConnectInfo<Uri>, Response = TcpConnection<Uri, IO>, Error = TcpConnectError>
         + Clone
         + 'static,
 {
@@ -166,18 +169,21 @@ where
 
     #[cfg(feature = "openssl")]
     /// Use custom `SslConnector` instance.
-    pub fn ssl(mut self, connector: actix_tls::connect::ssl::openssl::SslConnector) -> Self {
+    pub fn ssl(
-        self.ssl = SslConnector::Openssl(connector);
+        mut self,
+        connector: actix_tls::connect::openssl::reexports::SslConnector,
+    ) -> Self {
+        self.ssl = OurTlsConnector::Openssl(connector);
         self
     }
 
     #[cfg(feature = "rustls")]
-    /// Use custom `SslConnector` instance.
+    /// Use custom `ClientConfig` instance.
     pub fn rustls(
         mut self,
-        connector: std::sync::Arc<actix_tls::connect::ssl::rustls::ClientConfig>,
+        connector: std::sync::Arc<actix_tls::connect::rustls::reexports::ClientConfig>,
     ) -> Self {
-        self.ssl = SslConnector::Rustls(connector);
+        self.ssl = OurTlsConnector::Rustls(connector);
         self
     }
 
@@ -266,7 +272,7 @@ where
     /// Finish configuration process and create connector service.
     /// The Connector builder always concludes by calling `finish()` last in
     /// its combinator chain.
-    pub fn finish(self) -> ConnectorService<S, Io> {
+    pub fn finish(self) -> ConnectorService<S, IO> {
         let local_address = self.config.local_address;
         let timeout = self.config.timeout;
 
@@ -279,11 +285,12 @@ where
         };
 
         let tls_service = match self.ssl {
-            SslConnector::None => {
+            OurTlsConnector::None => {
                 #[cfg(not(feature = "dangerous-h2c"))]
                 {
                     None
                 }
+
                 #[cfg(feature = "dangerous-h2c")]
                 {
                     use std::io;
@@ -305,17 +312,17 @@ where
                     #[derive(Clone)]
                     struct NoOpTlsConnectorService;
 
-                    impl<T, U> Service<Connection<T, U>> for NoOpTlsConnectorService
+                    impl<R, IO> Service<Connection<R, IO>> for NoOpTlsConnectorService
                     where
-                        U: ActixStream + 'static,
+                        IO: ActixStream + 'static,
                     {
-                        type Response = Connection<T, Box<dyn ConnectionIo>>;
+                        type Response = Connection<R, Box<dyn ConnectionIo>>;
                         type Error = io::Error;
                         type Future = Ready<Result<Self::Response, Self::Error>>;
 
                         actix_service::always_ready!();
 
-                        fn call(&self, connection: Connection<T, U>) -> Self::Future {
+                        fn call(&self, connection: Connection<R, IO>) -> Self::Future {
                             let (io, connection) = connection.replace_io(());
                             let (_, connection) = connection.replace_io(Box::new(io) as _);
 
@@ -334,13 +341,14 @@ where
                     Some(actix_service::boxed::rc_service(tls_service))
                 }
             }
+
             #[cfg(feature = "openssl")]
-            SslConnector::Openssl(tls) => {
+            OurTlsConnector::Openssl(tls) => {
                 const H2: &[u8] = b"h2";
 
-                use actix_tls::connect::ssl::openssl::{OpensslConnector, SslStream};
+                use actix_tls::connect::openssl::{reexports::AsyncSslStream, TlsConnector};
 
-                impl<Io: ConnectionIo> IntoConnectionIo for TcpConnection<Uri, SslStream<Io>> {
+                impl<IO: ConnectionIo> IntoConnectionIo for TcpConnection<Uri, AsyncSslStream<IO>> {
                     fn into_connection_io(self) -> (Box<dyn ConnectionIo>, Protocol) {
                         let sock = self.into_parts().0;
                         let h2 = sock
@@ -359,19 +367,20 @@ where
 
                 let tls_service = TlsConnectorService {
                     tcp_service: tcp_service_inner,
-                    tls_service: OpensslConnector::service(tls),
+                    tls_service: TlsConnector::service(tls),
                     timeout: handshake_timeout,
                 };
 
                 Some(actix_service::boxed::rc_service(tls_service))
             }
+
             #[cfg(feature = "rustls")]
-            SslConnector::Rustls(tls) => {
+            OurTlsConnector::Rustls(tls) => {
                 const H2: &[u8] = b"h2";
 
-                use actix_tls::connect::ssl::rustls::{RustlsConnector, TlsStream};
+                use actix_tls::connect::rustls::{reexports::AsyncTlsStream, TlsConnector};
 
-                impl<Io: ConnectionIo> IntoConnectionIo for TcpConnection<Uri, TlsStream<Io>> {
+                impl<Io: ConnectionIo> IntoConnectionIo for TcpConnection<Uri, AsyncTlsStream<Io>> {
                     fn into_connection_io(self) -> (Box<dyn ConnectionIo>, Protocol) {
                         let sock = self.into_parts().0;
                         let h2 = sock
@@ -391,7 +400,7 @@ where
 
                 let tls_service = TlsConnectorService {
                     tcp_service: tcp_service_inner,
-                    tls_service: RustlsConnector::service(tls),
+                    tls_service: TlsConnector::service(tls),
                     timeout: handshake_timeout,
                 };
 
@@ -460,26 +469,28 @@ where
 
 /// service for establish tcp connection and do client tls handshake.
 /// operation is canceled when timeout limit reached.
-struct TlsConnectorService<S, St> {
+struct TlsConnectorService<Tcp, Tls> {
-    /// tcp connection is canceled on `TcpConnectorInnerService`'s timeout setting.
+    /// TCP connection is canceled on `TcpConnectorInnerService`'s timeout setting.
-    tcp_service: S,
+    tcp_service: Tcp,
-    /// tls connection is canceled on `TlsConnectorService`'s timeout setting.
+
-    tls_service: St,
+    /// TLS connection is canceled on `TlsConnectorService`'s timeout setting.
+    tls_service: Tls,
+
     timeout: Duration,
 }
 
-impl<S, St, Io> Service<Connect> for TlsConnectorService<S, St>
+impl<Tcp, Tls, IO> Service<Connect> for TlsConnectorService<Tcp, Tls>
 where
-    S: Service<Connect, Response = TcpConnection<Uri, Io>, Error = ConnectError>
+    Tcp: Service<Connect, Response = TcpConnection<Uri, IO>, Error = ConnectError>
         + Clone
         + 'static,
-    St: Service<TcpConnection<Uri, Io>, Error = std::io::Error> + Clone + 'static,
+    Tls: Service<TcpConnection<Uri, IO>, Error = std::io::Error> + Clone + 'static,
-    Io: ConnectionIo,
+    Tls::Response: IntoConnectionIo,
-    St::Response: IntoConnectionIo,
+    IO: ConnectionIo,
 {
     type Response = (Box<dyn ConnectionIo>, Protocol);
     type Error = ConnectError;
-    type Future = TlsConnectorFuture<St, S::Future, St::Future>;
+    type Future = TlsConnectorFuture<Tls, Tcp::Future, Tls::Future>;
 
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         ready!(self.tcp_service.poll_ready(cx))?;
@@ -579,7 +590,7 @@ impl<S: Clone> TcpConnectorInnerService<S> {
 
 impl<S, Io> Service<Connect> for TcpConnectorInnerService<S>
 where
-    S: Service<TcpConnect<Uri>, Response = TcpConnection<Uri, Io>, Error = TcpConnectError>
+    S: Service<ConnectInfo<Uri>, Response = TcpConnection<Uri, Io>, Error = TcpConnectError>
         + Clone
         + 'static,
 {
@@ -590,7 +601,7 @@ where
     actix_service::forward_ready!(service);
 
     fn call(&self, req: Connect) -> Self::Future {
-        let mut req = TcpConnect::new(req.uri).set_addr(req.addr);
+        let mut req = ConnectInfo::new(req.uri).set_addr(req.addr);
 
         if let Some(local_addr) = self.local_address {
             req = req.set_local_addr(local_addr);
@@ -629,8 +640,8 @@ where
 }
 
 /// Connector service for pooled Plain/Tls Tcp connections.
-pub type ConnectorService<S, Io> = ConnectorServicePriv<
+pub type ConnectorService<Svc, IO> = ConnectorServicePriv<
-    TcpConnectorService<TcpConnectorInnerService<S>>,
+    TcpConnectorService<TcpConnectorInnerService<Svc>>,
     Rc<
         dyn Service<
             Connect,
@@ -642,7 +653,7 @@ pub type ConnectorService<S, Io> = ConnectorServicePriv<
             >,
         >,
     >,
-    Io,
+    IO,
     Box<dyn ConnectionIo>,
 >;
 
@@ -741,7 +752,7 @@ mod resolver {
     use super::*;
 
     pub(super) fn resolver() -> Resolver {
-        Resolver::Default
+        Resolver::default()
     }
 }
 
@@ -783,8 +794,7 @@ mod resolver {
             }
         }
 
-        // dns struct is cached in thread local.
+        // resolver struct is cached in thread local so new clients can reuse the existing instance
-        // so new client constructor can reuse the existing dns resolver.
         thread_local! {
             static TRUST_DNS_RESOLVER: RefCell<Option<Resolver>> = RefCell::new(None);
         }
@@ -792,8 +802,10 @@ mod resolver {
         // get from thread local or construct a new trust-dns resolver.
         TRUST_DNS_RESOLVER.with(|local| {
             let resolver = local.borrow().as_ref().map(Clone::clone);
+
             match resolver {
                 Some(resolver) => resolver,
+
                 None => {
                     let (cfg, opts) = match read_system_conf() {
                         Ok((cfg, opts)) => (cfg, opts),
@@ -806,8 +818,9 @@ mod resolver {
                     let resolver = TokioAsyncResolver::tokio(cfg, opts).unwrap();
 
                     // box trust dns resolver and put it in thread local.
-                    let resolver = Resolver::new_custom(TrustDnsResolver(resolver));
+                    let resolver = Resolver::custom(TrustDnsResolver(resolver));
                     *local.borrow_mut() = Some(resolver.clone());
+
                     resolver
                 }
             }
@@ -838,9 +851,9 @@ mod tests {
         .await;
 
         let connector = Connector {
-            connector: new_connector(resolver::resolver()),
+            connector: TcpConnector::new(resolver::resolver()).service(),
             config: ConnectorConfig::default(),
-            ssl: SslConnector::None,
+            ssl: OurTlsConnector::None,
         };
 
         let client = Client::builder().connector(connector).finish();

awc/src/client/error.rs

@@ -7,7 +7,7 @@ use actix_http::{
     http::Error as HttpError,
 };
 #[cfg(feature = "openssl")]
-use actix_tls::accept::openssl::SslError;
+use actix_tls::accept::openssl::reexports::Error as OpenSslError;
 
 /// A set of errors that can occur while connecting to an HTTP host
 #[derive(Debug, Display, From)]
@@ -20,7 +20,7 @@ pub enum ConnectError {
     /// SSL error
     #[cfg(feature = "openssl")]
     #[display(fmt = "{}", _0)]
-    SslError(SslError),
+    SslError(OpenSslError),
 
     /// Failed to resolve the hostname
     #[display(fmt = "Failed resolving hostname: {}", _0)]

awc/src/client/mod.rs

@@ -11,7 +11,7 @@ mod h2proto;
 mod pool;
 
 pub use actix_tls::connect::{
-    Connect as TcpConnect, ConnectError as TcpConnectError, Connection as TcpConnection,
+    ConnectError as TcpConnectError, ConnectInfo, Connection as TcpConnection,
 };
 
 pub use self::connection::{Connection, ConnectionIo};

awc/src/lib.rs

@@ -137,7 +137,7 @@ use actix_http::{
 use actix_rt::net::TcpStream;
 use actix_service::Service;
 
-use self::client::{TcpConnect, TcpConnectError, TcpConnection};
+use self::client::{ConnectInfo, TcpConnectError, TcpConnection};
 
 /// An asynchronous HTTP and WebSocket client.
 ///
@@ -186,7 +186,7 @@ impl Client {
     /// This function is equivalent of `ClientBuilder::new()`.
     pub fn builder() -> ClientBuilder<
         impl Service<
-                TcpConnect<Uri>,
+                ConnectInfo<Uri>,
                 Response = TcpConnection<Uri, TcpStream>,
                 Error = TcpConnectError,
             > + Clone,

awc/tests/test_client.rs

@@ -127,7 +127,7 @@ async fn test_timeout() {
     });
 
     let connector = awc::Connector::new()
-        .connector(actix_tls::connect::default_connector())
+        .connector(actix_tls::connect::ConnectorService::default())
         .timeout(Duration::from_secs(15));
 
     let client = awc::Client::builder()

awc/tests/test_rustls_client.rs

@@ -14,7 +14,7 @@ use std::{
 use actix_http::HttpService;
 use actix_http_test::test_server;
 use actix_service::{fn_service, map_config, ServiceFactoryExt};
-use actix_tls::connect::tls::rustls::webpki_roots_cert_store;
+use actix_tls::connect::rustls::webpki_roots_cert_store;
 use actix_utils::future::ok;
 use actix_web::{dev::AppConfig, http::Version, web, App, HttpResponse};
 use rustls::{

scripts/bump

@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# developed on macOS and probably doesn't work on Linux yet due to minor
+# differences in flags on sed
+
+# requires github cli tool for automatic release draft creation
+
+set -euo pipefail
+
+DIR=$1
+
+LINUX=""
+MACOS=""
+
+if [ "$(uname)" = "Darwin" ]; then
+    MACOS="1"
+fi
+
+CARGO_MANIFEST=$DIR/Cargo.toml
+CHANGELOG_FILE=$DIR/CHANGES.md
+README_FILE=$DIR/README.md
+
+# get current version
+PACKAGE_NAME="$(sed -nE 's/^name ?= ?"([^"]+)"$/\1/ p' "$CARGO_MANIFEST" | head -n 1)"
+CURRENT_VERSION="$(sed -nE 's/^version ?= ?"([^"]+)"$/\1/ p' "$CARGO_MANIFEST")"
+
+CHANGE_CHUNK_FILE="$(mktemp)"
+echo saving changelog to $CHANGE_CHUNK_FILE
+echo
+
+# get changelog chunk and save to temp file
+cat "$CHANGELOG_FILE" |
+    # skip up to unreleased heading
+    sed '1,/Unreleased/ d' |
+    # take up to previous version heading
+    sed "/$CURRENT_VERSION/ q" |
+    # drop last line
+    sed '$d' \
+        >"$CHANGE_CHUNK_FILE"
+
+# if word count of changelog chunk is 0 then insert filler changelog chunk
+if [ "$(wc -w "$CHANGE_CHUNK_FILE" | awk '{ print $1 }')" = "0" ]; then
+    echo "* No significant changes since \`$CURRENT_VERSION\`." >"$CHANGE_CHUNK_FILE"
+fi
+
+if [ -n "${2-}" ]; then
+    NEW_VERSION="$2"
+else
+    echo
+    echo "--- Changes since $CURRENT_VERSION ----"
+    cat "$CHANGE_CHUNK_FILE"
+    echo
+    read -p "Update version to: " NEW_VERSION
+fi
+
+DATE="$(date -u +"%Y-%m-%d")"
+echo "updating from $CURRENT_VERSION => $NEW_VERSION ($DATE)"
+
+# update package.version field
+sed -i.bak -E "s/^version ?= ?\"[^\"]+\"$/version = \"$NEW_VERSION\"/" "$CARGO_MANIFEST"
+
+# update readme
+[ -f "$README_FILE" ] && sed -i.bak -E "s#$CURRENT_VERSION([/)])#$NEW_VERSION\1#g" "$README_FILE"
+
+# update changelog file
+(
+    sed '/Unreleased/ q' "$CHANGELOG_FILE"                   # up to unreleased heading
+    echo                                                     # blank line
+    echo                                                     # blank line
+    echo "## $NEW_VERSION - $DATE"                           # new version heading
+    cat "$CHANGE_CHUNK_FILE"                                 # previously unreleased changes
+    sed "/$CURRENT_VERSION/ q" "$CHANGELOG_FILE" | tail -n 1 # the previous version heading
+    sed "1,/$CURRENT_VERSION/ d" "$CHANGELOG_FILE"           # everything after previous version heading
+) >"$CHANGELOG_FILE.bak"
+mv "$CHANGELOG_FILE.bak" "$CHANGELOG_FILE"
+
+# done; remove backup files
+rm -f $CARGO_MANIFEST.bak
+rm -f $CHANGELOG_FILE.bak
+rm -f $README_FILE.bak
+
+echo "manifest, changelog, and readme updated"
+echo
+echo "check other references:"
+rg "$PACKAGE_NAME =" || true
+rg "package = \"$PACKAGE_NAME\"" || true
+
+if [ $MACOS ]; then
+    printf "prepare $PACKAGE_NAME release $NEW_VERSION" | pbcopy
+else
+    echo
+    echo "commit message:"
+    echo "prepare $PACKAGE_NAME release $NEW_VERSION"
+fi
+
+SHORT_PACKAGE_NAME="$(echo $PACKAGE_NAME | sed 's/^actix-web-//' | sed 's/^actix-//')"
+GIT_TAG="$(echo $SHORT_PACKAGE_NAME-v$NEW_VERSION)"
+RELEASE_TITLE="$(echo $PACKAGE_NAME: v$NEW_VERSION)"
+
+echo
+echo "GitHub release command:"
+echo "gh release create \"$GIT_TAG\" --draft --title \"$RELEASE_TITLE\" --notes-file \"$CHANGE_CHUNK_FILE\" --prerelease"
+
+read -p "Submit draft GH release: (y/N) " GH_RELEASE
+GH_RELEASE="${GH_RELEASE:-n}"
+
+if [ "$GH_RELEASE" = 'y' ] || [ "$GH_RELEASE" = 'Y' ]; then
+    gh release create "$GIT_TAG" --draft --title "$RELEASE_TITLE" --notes-file "$CHANGE_CHUNK_FILE" --prerelease
+fi
+
+echo

scripts/ci-test.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# run tests matching what CI does for non-linux feature sets
+
+set -x
+
+cargo test --lib --tests -p=actix-router --all-features
+cargo test --lib --tests -p=actix-http --all-features
+cargo test --lib --tests -p=actix-web --features=rustls,openssl -- --skip=test_reading_deflate_encoding_large_random_rustls
+cargo test --lib --tests -p=actix-web-codegen --all-features
+cargo test --lib --tests -p=awc --all-features
+cargo test --lib --tests -p=actix-http-test --all-features
+cargo test --lib --tests -p=actix-test --all-features
+cargo test --lib --tests -p=actix-files
+cargo test --lib --tests -p=actix-multipart --all-features
+cargo test --lib --tests -p=actix-web-actors --all-features

src/error/response_error.rs

@@ -49,7 +49,7 @@ downcast_dyn!(ResponseError);
 impl ResponseError for Box<dyn StdError + 'static> {}
 
 #[cfg(feature = "openssl")]
-impl ResponseError for actix_tls::accept::openssl::SslError {}
+impl ResponseError for actix_tls::accept::openssl::reexports::Error {}
 
 impl ResponseError for serde::de::value::Error {
     fn status_code(&self) -> StatusCode {

src/server.rs

@@ -15,9 +15,9 @@ use actix_service::{
 };
 
 #[cfg(feature = "openssl")]
-use actix_tls::accept::openssl::{AlpnError, SslAcceptor, SslAcceptorBuilder};
+use actix_tls::accept::openssl::reexports::{AlpnError, SslAcceptor, SslAcceptorBuilder};
 #[cfg(feature = "rustls")]
-use actix_tls::accept::rustls::ServerConfig as RustlsServerConfig;
+use actix_tls::accept::rustls::reexports::ServerConfig as RustlsServerConfig;
 
 use crate::{config::AppConfig, Error};
 
@@ -108,11 +108,11 @@ where
     /// [Extensions] container so that request-local data can be passed to middleware and handlers.
     ///
     /// For example:
-    /// - `actix_tls::openssl::SslStream<actix_web::rt::net::TcpStream>` when using openssl.
+    /// - `actix_tls::accept::openssl::TlsStream<actix_web::rt::net::TcpStream>` when using openssl.
-    /// - `actix_tls::rustls::TlsStream<actix_web::rt::net::TcpStream>` when using rustls.
+    /// - `actix_tls::accept::rustls::TlsStream<actix_web::rt::net::TcpStream>` when using rustls.
     /// - `actix_web::rt::net::TcpStream` when no encryption is used.
     ///
-    /// See `on_connect` example for additional details.
+    /// See the `on_connect` example for additional details.
     pub fn on_connect<CB>(self, f: CB) -> HttpServer<F, I, S, B>
     where
         CB: Fn(&dyn Any, &mut Extensions) + Send + Sync + 'static,