Skip to content

Commit 387197e

Browse files
cratelynolix0r
andauthored
chore(hyper): upgrade to hyper 0.14.32 (linkerd#3472)
this commit upgrades to hyper 0.14.32, removing the manifest's `[patch]` section. hyperium/hyper#3796 backported a method we use when building http/2 connections. linkerd#3457 patched the workspace to rely on a git dependency of hyper at commit `a24f0c0a`. this work has been released in version 0.14.32. this commit also changes `deny.toml`, removing the exception we carved out for hyper in linkerd#3457. for more information, see: * hyperium/hyper#3796 * linkerd/linkerd2#8733 * https://github.com/hyperium/hyper/commits/0.14.x * linkerd#3457 * 03f5577 Signed-off-by: katelyn martin <[email protected]> Co-authored-by: Oliver Gould <[email protected]>
1 parent af52f36 commit 387197e

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

Cargo.lock

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,8 +942,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
942942

943943
[[package]]
944944
name = "hyper"
945-
version = "0.14.31"
946-
source = "git+https://github.com/hyperium/hyper.git?rev=a24f0c0a#a24f0c0af8e1f4c6b7cc3a47c83eb6e4af88aca6"
945+
version = "0.14.32"
946+
source = "registry+https://github.com/rust-lang/crates.io-index"
947+
checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
947948
dependencies = [
948949
"bytes",
949950
"futures-channel",

Cargo.toml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,17 @@ bytes = { version = "1" }
101101
h2 = { version = "0.3" }
102102
http = { version = "0.2" }
103103
http-body = { version = "0.4" }
104-
hyper = { version = "0.14", default-features = false }
104+
hyper = { version = "0.14.32", default-features = false }
105105
prost = { version = "0.12" }
106106
prost-types = { version = "0.12" }
107-
tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] }
107+
tokio-rustls = { version = "0.26", default-features = false, features = [
108+
"ring",
109+
"logging",
110+
] }
108111
tonic = { version = "0.10", default-features = false }
109112
tonic-build = { version = "0.10", default-features = false }
110113

111114
[workspace.dependencies.linkerd2-proxy-api]
112115
version = "0.15.0"
113116
# git = "https://github.com/linkerd/linkerd2-proxy-api.git"
114117
# branch = "main"
115-
116-
# NB: hyperium/hyper#3796 backports the server connection builder's
117-
# `max_pending_accept_reset_streams()` method. once released, we can depend on
118-
# 0.14.32 or later, but until then will point our hyper dependency to the
119-
# commit in the 0.14 branch.
120-
[patch.'crates-io'.hyper]
121-
git = "https://github.com/hyperium/hyper.git"
122-
rev = "a24f0c0a"

deny.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,4 @@ skip-tree = [
7171
[sources]
7272
unknown-registry = "deny"
7373
unknown-git = "deny"
74-
allow-git = ["https://github.com/hyperium/hyper.git"]
7574
allow-registry = ["https://github.com/rust-lang/crates.io-index"]

0 commit comments

Comments
 (0)