forked/reqwest-impersonate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enable trust-dns optional feature (#787)

Browse Source
This commit is contained in:
Sean McArthur
2020-02-27 12:57:13 -08:00
committed by GitHub
parent ae81a30cf7
commit 2e983694f6
4 changed files with 85 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/connect.rs
View File

@@ -19,8 +19,8 @@ use std::time::Duration;
use std::mem::MaybeUninit;
use pin_project_lite::pin_project;
//#[cfg(feature = "trust-dns")]
//use crate::dns::TrustDnsResolver;
#[cfg(feature = "trust-dns")]
use crate::dns::TrustDnsResolver;
use crate::proxy::{Proxy, ProxyScheme};
use crate::error::BoxError;
#[cfg(feature = "default-tls")]
@@ -28,9 +28,9 @@ use self::native_tls_conn::NativeTlsConn;
#[cfg(feature = "rustls-tls")]
use self::rustls_tls_conn::RustlsTlsConn;
//#[cfg(feature = "trust-dns")]
//type HttpConnector = hyper::client::HttpConnector<TrustDnsResolver>;
//#[cfg(not(feature = "trust-dns"))]
#[cfg(feature = "trust-dns")]
type HttpConnector = hyper::client::HttpConnector<TrustDnsResolver>;
#[cfg(not(feature = "trust-dns"))]
type HttpConnector = hyper::client::HttpConnector;
#[derive(Clone)]
@@ -413,14 +413,14 @@ fn into_uri(scheme: Scheme, host: Authority) -> Uri {
.expect("scheme and authority is valid Uri")
}
//#[cfg(feature = "trust-dns")]
//fn http_connector() -> crate::Result<HttpConnector> {
// TrustDnsResolver::new()
// .map(HttpConnector::new_with_resolver)
// .map_err(crate::error::dns_system_conf)
//}
#[cfg(feature = "trust-dns")]
fn http_connector() -> crate::Result<HttpConnector> {
TrustDnsResolver::new()
.map(HttpConnector::new_with_resolver)
.map_err(crate::error::builder)
}
//#[cfg(not(feature = "trust-dns"))]
#[cfg(not(feature = "trust-dns"))]
fn http_connector() -> crate::Result<HttpConnector> {
Ok(HttpConnector::new())
}