Skip to content

Commit 03f5577

Browse files
authored
chore(hyper): upgrade hyper to include hyperium/hyper#3796 (#3457)
* chore(hyper): define hyper as a workspace dependency this commit alters various crates' manifests, pointing to a common workspace-level hyper dependency. note that the lockfile is not altered, this commit does *not* affect the version of hyper used, or have any other affect on the dependency graph. this will make future maintenance, upgrading, and patching of our hyper dependency marginally easier. see linkerd/linkerd2#8733 for more information on upgrading to hyper 1.0. Signed-off-by: katelyn martin <kate@buoyant.io> * chore(hyper): upgrade hyper to include hyperium/hyper#3796 this commit bumps the version of the workspace's hyper dependency to include hyperium/hyper#3796, which backports the server connection builder's `max_pending_accept_reset_streams()` method. see linkerd/linkerd2#8733 for more information on upgrading to hyper 1.0. this commit is based upon #3456. to show the hyper commit in the context of the git log: ```sh ; basename $(pwd) hyper ; git remote get-url upstream git@github.com:hyperium/hyper.git ; git log --oneline --decorate 0.14.x -5 a24f0c0a (HEAD -> 0.14.x, upstream/0.14.x) feat(server): backport `max_pending_accept_reset_streams()` to builder (#3796) 96550840 chore(ci): pin hashbrown for MSRV job (#3797) 7829148b (tag: v0.14.31) v0.14.31 97b595e5 perf(http1): improve parsing of sequentially partial messages 739d5e63 chore(ci): pin some deps for MSRV job ``` Signed-off-by: katelyn martin <kate@buoyant.io> * chore(deny.toml): add `hyperium/hyper` to git allowlist Signed-off-by: katelyn martin <kate@buoyant.io> --------- Signed-off-by: katelyn martin <kate@buoyant.io>
1 parent c740b6d commit 03f5577

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

Cargo.lock

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,8 +943,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
943943
[[package]]
944944
name = "hyper"
945945
version = "0.14.31"
946-
source = "registry+https://github.com/rust-lang/crates.io-index"
947-
checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
946+
source = "git+https://github.com/hyperium/hyper.git?rev=a24f0c0a#a24f0c0af8e1f4c6b7cc3a47c83eb6e4af88aca6"
948947
dependencies = [
949948
"bytes",
950949
"futures-channel",

Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,11 @@ hyper = { version = "0.14", default-features = false }
101101
linkerd2-proxy-api = "0.15.0"
102102
tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] }
103103
# linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api.git", branch = "main" }
104+
105+
# NB: hyperium/hyper#3796 backports the server connection builder's
106+
# `max_pending_accept_reset_streams()` method. once released, we can depend on
107+
# 0.14.32 or later, but until then will point our hyper dependency to the
108+
# commit in the 0.14 branch.
109+
[patch.'crates-io'.hyper]
110+
git = "https://github.com/hyperium/hyper.git"
111+
rev = "a24f0c0a"

deny.toml

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

0 commit comments

Comments
 (0)