diff --git a/Cargo.lock b/Cargo.lock index ef65a24070b..c6b0be169a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2443,8 +2443,7 @@ dependencies = [ [[package]] name = "hyper" version = "1.0.0-rc.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d280a71f348bcc670fc55b02b63c53a04ac0bf2daff2980795aeaf53edae10e6" +source = "git+https://github.com/meowjesty/hyper?branch=master#d4a61e3da87a08a25772cd3aa2f503cb4346c81f" dependencies = [ "bytes", "futures-channel", @@ -2508,7 +2507,7 @@ dependencies = [ [[package]] name = "hyper-util" version = "0.0.0" -source = "git+https://github.com/hyperium/hyper-util#f898015fc9eca9f459ddac521db278d904099e89" +source = "git+https://github.com/meowjesty/hyper-util?branch=issue/1869/update-runtime#fc9d572f0e8ce4a9f1c01f3420bf26ad4f2ab65e" dependencies = [ "futures-channel", "futures-util", diff --git a/Cargo.toml b/Cargo.toml index 6f21a813c25..60ecc29f324 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,9 +60,11 @@ miette = "5" fancy-regex = { version = "0.10" } enum_dispatch = "0.3" -hyper = { version = "1.0.0-rc.4", features = ["full"] } -# TODO switch to release when available -hyper-util = { git = "https://github.com/hyperium/hyper-util", commit = "f898015fc9eca9f459ddac521db278d904099e89" } +# TODO(alex): Waiting for a new RC release with the fix for #1869. +hyper = { git = "https://github.com/meowjesty/hyper", branch = "master", features = ["full"] } +# TODO(alex): This has a dependency on `hyper`, so we're blocked until new RC and the `hyper-util` +# crate itself is updated to depend on newer `hyper`. +hyper-util = { git = "https://github.com/meowjesty/hyper-util", branch = "issue/1869/update-runtime" } http-body = "1.0.0-rc.2" http-body-util = "0.1.0-rc.3" libc = "0.2" diff --git a/changelog.d/1869.fixed.md b/changelog.d/1869.fixed.md new file mode 100644 index 00000000000..735e0928683 --- /dev/null +++ b/changelog.d/1869.fixed.md @@ -0,0 +1 @@ +Update hyper and hyper-util to fix double select call (and properly handle large http traffic). \ No newline at end of file