berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix feature flag

This commit is contained in:
fakeshadow 2021-01-19 12:24:47 +08:00
parent 9d4bc34473
commit 4d688ae921
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
awc/src/connector.rs
View File

@ -1,21 +1,23 @@
// TODO: this mod bypass actix-http and use actix_tls::connect directly. // TODO: this mod bypass actix-http and use actix_tls::connect directly.
// Future refactor should change this mod if actix-http still used as upstream dep of awc. // Future refactor should change this mod if actix-http still used as upstream dep of awc.
pub(crate) use connector_impl::*; pub use connector_impl::*;
#[cfg(not(features = "trust-dns"))] #[cfg(not(feature = "trust-dns"))]
pub(crate) mod connector_impl { mod connector_impl {
pub(crate) use actix_tls::connect::default_connector; pub use actix_tls::connect::default_connector;
} }
#[cfg(features = "trust-dns")] #[cfg(feature = "trust-dns")]
pub(crate) mod connector_impl { mod connector_impl {
// resolver implementation using trust-dns crate. // resolver implementation using trust-dns crate.
use std::net::SocketAddr; use std::net::SocketAddr;
use actix_rt::{net::TcpStream, Arbiter}; use actix_rt::{net::TcpStream, Arbiter};
use actix_service::ServiceFactory; use actix_service::Service;
use actix_tls::connect::{Connect, ConnectError, Connection, Resolve, Resolver}; use actix_tls::connect::{
Address, Connect, ConnectError, Connection, Resolve, Resolver,
};
use futures_core::future::LocalBoxFuture; use futures_core::future::LocalBoxFuture;
use trust_dns_resolver::{ use trust_dns_resolver::{
config::{ResolverConfig, ResolverOpts}, config::{ResolverConfig, ResolverOpts},
@ -47,7 +49,7 @@ pub(crate) mod connector_impl {
let resolver = TokioAsyncResolver::tokio(cfg, opts).unwrap(); let resolver = TokioAsyncResolver::tokio(cfg, opts).unwrap();
Arbiter::set_item(resolver.clone()); Arbiter::set_item(resolver.clone());
resolver TrustDnsResolver { resolver }
} }
} }
} }
@ -61,7 +63,7 @@ pub(crate) mod connector_impl {
{ {
Box::pin(async move { Box::pin(async move {
let res = self let res = self
.trust_dns .resolver
.lookup_ip(host) .lookup_ip(host)
.await? .await?
.iter() .iter()
@ -72,13 +74,9 @@ pub(crate) mod connector_impl {
} }
} }
pub(crate) fn default_connector() -> impl ServiceFactory< pub fn default_connector<T: Address + 'static>(
Connect<T>, ) -> impl Service<Connect<T>, Response = Connection<T, TcpStream>, Error = ConnectError>
Config = (), + Clone {
Response = Connection<T, TcpStream>,
Error = ConnectError,
InitError = (),
> + Clone {
actix_tls::connect::new_connector(Resolver::new_custom(TrustDnsResolver::new())) actix_tls::connect::new_connector(Resolver::new_custom(TrustDnsResolver::new()))
} }
} }

2
awc/src/lib.rs
View File

@ -105,7 +105,7 @@ use actix_http::RequestHead;
mod builder; mod builder;
mod connect; mod connect;
mod connector; pub mod connector;
pub mod error; pub mod error;
mod frozen; mod frozen;
mod request; mod request;

2
awc/tests/test_client.rs
View File

@ -120,7 +120,7 @@ async fn test_timeout() {
}); });
let connector = awc::Connector::new() let connector = awc::Connector::new()
.connector(actix_tls::connect::default_connector()) .connector(awc::connector::default_connector())
.timeout(Duration::from_secs(15)) .timeout(Duration::from_secs(15))
.finish(); .finish();