Expose `client_async_tls_with_connector_and_config`

pull/94/head
Alisue 4 years ago committed by Sebastian Dröge
parent 44a59b66e5
commit e152c8511b
  1. 17
      src/async_std.rs
  2. 10
      src/tokio.rs
  3. 5
      src/tokio/dummy_tls.rs

@ -122,7 +122,10 @@ pub(crate) mod dummy_tls {
} }
} }
pub(crate) async fn client_async_tls_with_connector_and_config<R, S>( /// Creates a WebSocket handshake from a request and a stream,
/// upgrading the stream to TLS if required and using the given
/// connector and WebSocket configuration.
pub async fn client_async_tls_with_connector_and_config<R, S>(
request: R, request: R,
stream: S, stream: S,
connector: Option<Connector>, connector: Option<Connector>,
@ -146,15 +149,21 @@ pub(crate) mod dummy_tls {
} }
#[cfg(not(any(feature = "async-tls", feature = "async-native-tls")))] #[cfg(not(any(feature = "async-tls", feature = "async-native-tls")))]
use self::dummy_tls::{client_async_tls_with_connector_and_config, AutoStream}; pub use self::dummy_tls::client_async_tls_with_connector_and_config;
#[cfg(not(any(feature = "async-tls", feature = "async-native-tls")))]
use self::dummy_tls::AutoStream;
#[cfg(all(feature = "async-tls", not(feature = "async-native-tls")))] #[cfg(all(feature = "async-tls", not(feature = "async-native-tls")))]
use crate::async_tls::{client_async_tls_with_connector_and_config, AutoStream}; pub use crate::async_tls::client_async_tls_with_connector_and_config;
#[cfg(all(feature = "async-tls", not(feature = "async-native-tls")))]
use crate::async_tls::AutoStream;
#[cfg(all(feature = "async-tls", not(feature = "async-native-tls")))] #[cfg(all(feature = "async-tls", not(feature = "async-native-tls")))]
type Connector = real_async_tls::TlsConnector; type Connector = real_async_tls::TlsConnector;
#[cfg(feature = "async-native-tls")] #[cfg(feature = "async-native-tls")]
use self::async_native_tls::{client_async_tls_with_connector_and_config, AutoStream, Connector}; pub use self::async_native_tls::client_async_tls_with_connector_and_config;
#[cfg(feature = "async-native-tls")]
use self::async_native_tls::{AutoStream, Connector};
/// Type alias for the stream type of the `client_async()` functions. /// Type alias for the stream type of the `client_async()` functions.
pub type ClientStream<S> = AutoStream<S>; pub type ClientStream<S> = AutoStream<S>;

@ -82,7 +82,15 @@ use self::tls::{AutoStream, Connector};
feature = "tokio-openssl", feature = "tokio-openssl",
feature = "async-tls" feature = "async-tls"
)))] )))]
use self::tls::{client_async_tls_with_connector_and_config, AutoStream}; pub use self::tls::client_async_tls_with_connector_and_config;
#[cfg(not(any(
feature = "tokio-native-tls",
feature = "tokio-rustls-native-certs",
feature = "tokio-rustls-webpki-roots",
feature = "tokio-openssl",
feature = "async-tls"
)))]
use self::tls::AutoStream;
/// Creates a WebSocket handshake from a request and a stream. /// Creates a WebSocket handshake from a request and a stream.
/// For convenience, the user may call this with a url string, a URL, /// For convenience, the user may call this with a url string, a URL,

@ -28,7 +28,10 @@ where
} }
} }
pub(crate) async fn client_async_tls_with_connector_and_config<R, S>( /// Creates a WebSocket handshake from a request and a stream,
/// upgrading the stream to TLS if required and using the given
/// connector and WebSocket configuration.
pub async fn client_async_tls_with_connector_and_config<R, S>(
request: R, request: R,
stream: S, stream: S,
connector: Option<Connector>, connector: Option<Connector>,

Loading…
Cancel
Save