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

port all optional features to 2018-edition

Browse Source
This commit is contained in:
Daniel Eades
2019-08-08 18:47:12 +01:00
committed by Sean McArthur
parent 4773408ae4
commit 3ba4b6eadf
20 changed files with 103 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/async_impl/client.rs
View File

@@ -109,7 +109,7 @@ impl ClientBuilder {
#[cfg(feature = "tls")]
certs_verification: true,
connect_timeout: None,
max_idle_per_host: ::std::usize::MAX,
max_idle_per_host: std::usize::MAX,
proxies: Vec::new(),
redirect_policy: RedirectPolicy::default(),
referer: true,
@@ -160,9 +160,9 @@ impl ClientBuilder {
},
#[cfg(feature = "rustls-tls")]
TlsBackend::Rustls => {
use ::tls::NoVerifier;
use crate::tls::NoVerifier;
let mut tls = ::rustls::ClientConfig::new();
let mut tls = rustls::ClientConfig::new();
if config.http2_only {
tls.set_protocols(&["h2".into()]);
} else {
@@ -195,7 +195,7 @@ impl ClientBuilder {
connector.set_timeout(config.connect_timeout);
let mut builder = ::hyper::Client::builder();
let mut builder = hyper::Client::builder();
if config.http2_only {
builder.http2_only(true);
}
@@ -441,7 +441,7 @@ impl ClientBuilder {
}
}
type HyperClient = ::hyper::Client<Connector>;
type HyperClient = hyper::Client<Connector>;
impl Client {
/// Constructs a new `Client`.
@@ -590,13 +590,13 @@ impl Client {
(Some(reusable), body)
},
None => {
(None, ::hyper::Body::empty())
(None, hyper::Body::empty())
}
};
self.proxy_auth(&uri, &mut headers);
let mut req = ::hyper::Request::builder()
let mut req = hyper::Request::builder()
.method(method.clone())
.uri(uri.clone())
.body(body)
@@ -826,10 +826,10 @@ impl Future for PendingRequest {
debug!("redirecting to {:?} '{}'", self.method, self.url);
let uri = expect_uri(&self.url);
let body = match self.body {
Some(Some(ref body)) => ::hyper::Body::from(body.clone()),
_ => ::hyper::Body::empty(),
Some(Some(ref body)) => hyper::Body::from(body.clone()),
_ => hyper::Body::empty(),
};
let mut req = ::hyper::Request::builder()
let mut req = hyper::Request::builder()
.method(self.method.clone())
.uri(uri.clone())
.body(body)