diff --git a/Cargo.lock b/Cargo.lock index 5170a8fe0918..ea7f2e9acf85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -973,7 +973,7 @@ dependencies = [ "aws-types", "bytes", "http 0.2.9", - "http-body", + "http-body 0.4.5", "pin-project-lite", "tracing", ] @@ -1068,7 +1068,7 @@ dependencies = [ "aws-types", "bytes", "http 0.2.9", - "http-body", + "http-body 0.4.5", "once_cell", "percent-encoding", "regex", @@ -1152,7 +1152,7 @@ dependencies = [ "crc32fast", "hex", "http 0.2.9", - "http-body", + "http-body 0.4.5", "md-5", "pin-project-lite", "sha1", @@ -1184,7 +1184,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.9", - "http-body", + "http-body 0.4.5", "once_cell", "percent-encoding", "pin-project-lite", @@ -1224,7 +1224,7 @@ dependencies = [ "bytes", "fastrand 2.0.0", "http 0.2.9", - "http-body", + "http-body 0.4.5", "hyper", "hyper-rustls", "once_cell", @@ -1261,7 +1261,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.9", - "http-body", + "http-body 0.4.5", "hyper", "itoa", "num-integer", @@ -1310,7 +1310,7 @@ dependencies = [ "bytes", "futures-util", "http 0.2.9", - "http-body", + "http-body 0.4.5", "hyper", "itoa", "matchit", @@ -1340,7 +1340,7 @@ dependencies = [ "bytes", "futures-util", "http 0.2.9", - "http-body", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -4563,11 +4563,34 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "http-range-header" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" +checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe" [[package]] name = "httparse" @@ -4599,7 +4622,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.9", - "http-body", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -7862,7 +7885,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.9", - "http-body", + "http-body 0.4.5", "hyper", "hyper-rustls", "hyper-tls", @@ -8208,7 +8231,7 @@ dependencies = [ "governor", "hex", "http 0.2.9", - "http-body", + "http-body 0.4.5", "humantime", "hyper", "hytra", @@ -11471,7 +11494,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.9", - "http-body", + "http-body 0.4.5", "hyper", "hyper-timeout", "percent-encoding", @@ -11501,7 +11524,7 @@ dependencies = [ "bytes", "h2", "http 0.2.9", - "http-body", + "http-body 0.4.5", "hyper", "hyper-timeout", "percent-encoding", @@ -11550,16 +11573,16 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.4" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +checksum = "09e12e6351354851911bdf8c2b8f2ab15050c567d70a8b9a37ae7b8301a4080d" dependencies = [ "bitflags 2.4.0", "bytes", - "futures-core", "futures-util", - "http 0.2.9", - "http-body", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", "http-range-header", "httpdate", "mime", diff --git a/src/common/common_service/Cargo.toml b/src/common/common_service/Cargo.toml index ea228f9dcba8..0b45cc391127 100644 --- a/src/common/common_service/Cargo.toml +++ b/src/common/common_service/Cargo.toml @@ -27,7 +27,7 @@ thiserror-ext = { workspace = true } tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal"] } tonic = { workspace = true } tower = { version = "0.4", features = ["util", "load-shed"] } -tower-http = { version = "0.4", features = ["add-extension", "cors"] } +tower-http = { version = "0.5", features = ["add-extension", "cors"] } tracing = "0.1" [target.'cfg(not(madsim))'.dependencies] diff --git a/src/meta/Cargo.toml b/src/meta/Cargo.toml index 96d33a3afb0d..081a5a27dd02 100644 --- a/src/meta/Cargo.toml +++ b/src/meta/Cargo.toml @@ -90,7 +90,7 @@ uuid = { version = "1", features = ["v4"] } [target.'cfg(not(madsim))'.dependencies] axum = "0.6" -tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] } +tower-http = { version = "0.5", features = ["add-extension", "cors", "fs"] } workspace-hack = { path = "../workspace-hack" } [dev-dependencies]