Skip to content

Commit 63ffa5e

Browse files
committed
wip: hyper v1 upgrade
1 parent ef2c8ee commit 63ffa5e

16 files changed

+488
-399
lines changed

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ jobs:
209209

210210
docs:
211211
name: Docs
212+
needs: [test]
212213
runs-on: ubuntu-latest
213214

214215
steps:

Cargo.toml

+15-12
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ default-tls = ["hyper-tls", "native-tls-crate", "__tls", "tokio-native-tls"]
3535

3636
# Enables native-tls specific functionality not available by default.
3737
native-tls = ["default-tls"]
38-
native-tls-alpn = ["native-tls", "native-tls-crate/alpn"]
38+
native-tls-alpn = ["native-tls", "native-tls-crate/alpn", "hyper-tls/alpn"]
3939
native-tls-vendored = ["native-tls", "native-tls-crate/vendored"]
4040

4141
rustls-tls = ["rustls-tls-webpki-roots"]
@@ -74,14 +74,14 @@ __tls = []
7474

7575
# Enables common rustls code.
7676
# Equivalent to rustls-tls-manual-roots but shorter :)
77-
__rustls = ["hyper-rustls", "tokio-rustls", "rustls", "__tls", "rustls-pemfile"]
77+
__rustls = ["hyper-rustls", "tokio-rustls", "rustls", "__tls", "rustls-pemfile", "rustls-pki-types"]
7878

7979
# When enabled, disable using the cached SYS_PROXIES.
8080
__internal_proxy_sys_no_cache = []
8181

8282
[dependencies]
8383
base64 = "0.21"
84-
http = "0.2"
84+
http = "1"
8585
url = "2.2"
8686
bytes = "1.0"
8787
serde = "1.0"
@@ -100,9 +100,11 @@ mime_guess = { version = "2.0", default-features = false, optional = true }
100100

101101
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
102102
encoding_rs = "0.8"
103-
http-body = "0.4.0"
104-
hyper = { version = "0.14.21", default-features = false, features = ["tcp", "http1", "http2", "client", "runtime"] }
105-
h2 = "0.3.14"
103+
http-body = "1"
104+
http-body-util = "0.1"
105+
hyper = { version = "1", features = ["http1", "http2", "client"] }
106+
hyper-util = { version = "0.1", features = ["http1", "http2", "client", "client-legacy", "tokio"] }
107+
h2 = "0.4"
106108
once_cell = "1"
107109
log = "0.4"
108110
mime = "0.3.16"
@@ -114,15 +116,16 @@ ipnet = "2.3"
114116
# Optional deps...
115117

116118
## default-tls
117-
hyper-tls = { version = "0.5", optional = true }
119+
hyper-tls = { version = "0.6", optional = true }
118120
native-tls-crate = { version = "0.2.10", optional = true, package = "native-tls" }
119121
tokio-native-tls = { version = "0.3.0", optional = true }
120122

121123
# rustls-tls
122-
hyper-rustls = { version = "0.24.0", default-features = false, optional = true }
123-
rustls = { version = "0.21.6", features = ["dangerous_configuration"], optional = true }
124-
tokio-rustls = { version = "0.24", optional = true }
125-
webpki-roots = { version = "0.25", optional = true }
124+
hyper-rustls = { version = "0.26.0", default-features = false, optional = true }
125+
rustls = { version = "0.22.2", optional = true }
126+
rustls-pki-types = { version = "1.1.0", features = ["alloc"] ,optional = true }
127+
tokio-rustls = { version = "0.25", optional = true }
128+
webpki-roots = { version = "0.26.0", optional = true }
126129
rustls-native-certs = { version = "0.6", optional = true }
127130
rustls-pemfile = { version = "1.0", optional = true }
128131

@@ -149,7 +152,7 @@ futures-channel = { version="0.3", optional = true}
149152

150153
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
151154
env_logger = "0.10"
152-
hyper = { version = "0.14", default-features = false, features = ["tcp", "stream", "http1", "http2", "client", "server", "runtime"] }
155+
hyper = { version = "1.1.0", default-features = false, features = ["http1", "http2", "client", "server"] }
153156
serde = { version = "1.0", features = ["derive"] }
154157
libflate = "1.0"
155158
brotli_crate = { package = "brotli", version = "3.3.0" }

0 commit comments

Comments
 (0)