diff --git a/Cargo.lock b/Cargo.lock index d2e36e78..1dee6e57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3464,9 +3464,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", "rustls-pemfile 2.1.3", @@ -3502,9 +3502,9 @@ checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.1" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring 0.17.7", "rustls-pki-types", diff --git a/Cargo.toml b/Cargo.toml index a95e89ee..0eec6ac9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ hyper-rustls = { version = "0.26", features = ["http1", "http2", "logging"] } http-range-header = "0.4.1" tracing = "0.1" url = "2.5.2" -rustls = "0.22.4" +rustls = { version = "0.22.4", features = ["tls12"] } rustls-pki-types = "1.8.0" rustls-pemfile = "2.1.3" sha2 = "0.10" diff --git a/dragonfly-client/src/proxy/mod.rs b/dragonfly-client/src/proxy/mod.rs index d25e0fe3..5f1cda52 100644 --- a/dragonfly-client/src/proxy/mod.rs +++ b/dragonfly-client/src/proxy/mod.rs @@ -857,11 +857,14 @@ async fn proxy_https( .with_tls_config(client_config_builder) .https_or_http() .enable_http1() - .enable_http2() .build(); - let client = Client::builder(TokioExecutor::new()).build::<_, hyper::body::Incoming>(https); - let response = client.request(request).await?; + let client = Client::builder(TokioExecutor::new()).build(https); + let response = client.request(request).await.map_err(|err| { + error!("request failed: {:?}", err); + err + })?; + Ok(response.map(|b| b.map_err(ClientError::from).boxed())) }