Bump hyper v1.1 and http v1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hyper-proxy"
-version = "0.10.1"
+version = "0.10.2"
 authors = ["Johann Tuffe <[email protected]>"]
 description = "A proxy connector for Hyper-based applications"
 
@@ -15,10 +15,11 @@ edition = "2018"
 
 [dependencies]
 tokio = { version = "1", features = ["io-std", "io-util"] }
-hyper = { version = "0.14", features = ["client"] }
+hyper = { version = "1.1", features = ["client"] }
+hyper-util = { version = "0.1.2", default-features = false, features = ["client-legacy", "tokio"] }
 
 tower-service = "0.3"
-http = "0.2"
+http = "1"
 futures-util = { version = "0.3", default-features = false }
 bytes = "1.0"
 hyper-tls = { version = "0.5.0", optional = true }
@@ -32,7 +33,7 @@ hyper-rustls = { version = "0.24", optional = true }
 webpki = { version = "0.21", optional = true }
 rustls-native-certs = { version = "0.6", optional = true }
 webpki-roots = { version = "0.21.0", optional = true }
-headers = "0.3"
+headers = "0.4"
 
 [dev-dependencies]
 tokio = { version = "1.0", features = ["full"] }

src/lib.rs

@@ -58,7 +58,9 @@ mod stream;
 mod tunnel;
 
 use http::header::{HeaderMap, HeaderName, HeaderValue};
-use hyper::{service::Service, Uri};
+use hyper::Uri;
+
+use tower_service::Service;
 
 use futures_util::future::TryFutureExt;
 #[cfg(feature = "rustls-base")]
@@ -458,19 +460,19 @@ where
 
     fn call(&mut self, uri: Uri) -> Self::Future {
         if let (Some(p), Some(host)) = (self.match_proxy(&uri), uri.host()) {
-            if uri.scheme() == Some(&http::uri::Scheme::HTTPS) || p.force_connect {
+            if uri.scheme() == Some(&hyper::http::uri::Scheme::HTTPS) || p.force_connect {
                 let host = host.to_owned();
-                let port =
-                    uri.port_u16()
-                        .unwrap_or(if uri.scheme() == Some(&http::uri::Scheme::HTTP) {
-                            80
-                        } else {
-                            443
-                        });
+                let port = uri.port_u16().unwrap_or(
+                    if uri.scheme() == Some(&hyper::http::uri::Scheme::HTTP) {
+                        80
+                    } else {
+                        443
+                    },
+                );
                 let tunnel = tunnel::new(&host, port, &p.headers);
                 let connection =
                     proxy_dst(&uri, &p.uri).map(|proxy_url| self.connector.call(proxy_url));
-                let tls = if uri.scheme() == Some(&http::uri::Scheme::HTTPS) {
+                let tls = if uri.scheme() == Some(&hyper::http::uri::Scheme::HTTPS) {
                     self.tls.clone()
                 } else {
                     None

src/stream.rs

@@ -12,7 +12,7 @@ use tokio_native_tls::TlsStream;
 #[cfg(feature = "openssl-tls")]
 use tokio_openssl::SslStream as OpenSslStream;
 
-use hyper::client::connect::{Connected, Connection};
+use hyper_util::client::legacy::connect::{Connected, Connection};
 
 #[cfg(feature = "rustls-base")]
 pub type TlsStream<R> = RustlsStream<R>;