diff --git a/Cargo.lock b/Cargo.lock index 6be570b2eabd9..13752be95ab1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -504,7 +504,7 @@ dependencies = [ "base64 0.21.4", "bytes", "futures", - "http", + "http 0.2.9", "memchr", "nkeys", "nuid", @@ -702,7 +702,7 @@ dependencies = [ "aws-types", "bytes", "fastrand 2.0.0", - "http", + "http 0.2.9", "hyper", "time", "tokio", @@ -732,8 +732,8 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "pin-project-lite", "tracing", ] @@ -754,7 +754,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "fastrand 2.0.0", - "http", + "http 0.2.9", "percent-encoding", "tracing", "uuid", @@ -779,7 +779,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "fastrand 2.0.0", - "http", + "http 0.2.9", "regex", "tracing", ] @@ -801,7 +801,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", + "http 0.2.9", "regex", "tracing", ] @@ -827,8 +827,8 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "once_cell", "percent-encoding", "regex", @@ -854,7 +854,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "http", + "http 0.2.9", "regex", "tracing", ] @@ -873,7 +873,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "http", + "http 0.2.9", "num-bigint", "once_cell", "p256 0.11.1", @@ -909,8 +909,8 @@ dependencies = [ "crc32c", "crc32fast", "hex", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "md-5", "pin-project-lite", "sha1", @@ -941,8 +941,8 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "once_cell", "percent-encoding", "pin-project-lite", @@ -981,8 +981,8 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.0.0", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-rustls", "once_cell", @@ -1002,7 +1002,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-types", "bytes", - "http", + "http 0.2.9", "pin-project-lite", "tokio", "tracing", @@ -1018,8 +1018,8 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "itoa", "num-integer", @@ -1051,7 +1051,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "http", + "http 0.2.9", "rustc_version", "tracing", ] @@ -1067,8 +1067,8 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "itoa", "matchit", @@ -1097,8 +1097,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -2921,7 +2921,7 @@ name = "etcd-client" version = "0.12.1" source = "git+https://github.com/risingwavelabs/etcd-client.git?rev=4e84d40#4e84d40a84b35718d814cc2afccc9274c9d78e1e" dependencies = [ - "http", + "http 0.2.9", "prost 0.12.1", "tokio", "tokio-stream", @@ -3630,7 +3630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8bdaaa4bc036e8318274d1b25f0f2265b3e95418b765fd1ea1c7ef938fd69bd" dependencies = [ "google-cloud-token", - "http", + "http 0.2.9", "thiserror", "tokio", "tokio-retry", @@ -3739,7 +3739,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", "indexmap 1.9.3", "slab", "tokio", @@ -3904,6 +3904,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -3911,10 +3922,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", "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-range-header" version = "0.3.1" @@ -3950,8 +3971,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -3970,7 +3991,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.9", "hyper", "log", "rustls", @@ -4724,7 +4745,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", + "http 0.2.9", "madsim", "spin 0.9.8", "tracing", @@ -4738,7 +4759,7 @@ checksum = "02b4b5de48bb7f3f7eae0bca62b3ed0b7d714b1b273d7347329b92c3a2eef113" dependencies = [ "etcd-client", "futures-util", - "http", + "http 0.2.9", "madsim", "serde", "serde_with", @@ -5421,7 +5442,7 @@ dependencies = [ "base64 0.13.1", "chrono", "getrandom", - "http", + "http 0.2.9", "rand", "reqwest", "serde", @@ -5468,7 +5489,7 @@ dependencies = [ "chrono", "flagset", "futures", - "http", + "http 0.2.9", "hyper", "log", "md-5", @@ -5498,7 +5519,7 @@ dependencies = [ "dyn-clone", "ed25519-dalek", "hmac", - "http", + "http 0.2.9", "itertools 0.10.5", "log", "oauth2", @@ -5591,7 +5612,7 @@ checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" dependencies = [ "async-trait", "futures-core", - "http", + "http 0.2.9", "opentelemetry-proto", "opentelemetry-semantic-conventions", "opentelemetry_api", @@ -7030,7 +7051,7 @@ dependencies = [ "hex", "hmac", "home", - "http", + "http 0.2.9", "jsonwebtoken", "log", "once_cell", @@ -7059,8 +7080,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-rustls", "hyper-tls", @@ -7379,8 +7400,8 @@ dependencies = [ "fs-err", "futures", "hex", - "http", - "http-body", + "http 0.2.9", + "http-body 1.0.0", "humantime", "hyper", "hytra", @@ -7613,7 +7634,7 @@ dependencies = [ "gcp-bigquery-client", "glob", "google-cloud-pubsub", - "http", + "http 0.2.9", "hyper", "hyper-tls", "icelake", @@ -10541,8 +10562,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-timeout", "percent-encoding", @@ -10571,8 +10592,8 @@ dependencies = [ "base64 0.21.4", "bytes", "h2", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "hyper", "hyper-timeout", "percent-encoding", @@ -10629,8 +10650,8 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-range-header", "httpdate", "mime", @@ -11573,7 +11594,7 @@ dependencies = [ "async-trait", "base64 0.13.1", "futures", - "http", + "http 0.2.9", "hyper", "hyper-rustls", "itertools 0.10.5", diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml index 27b3a4249e3bc..35e98bb36c5f8 100644 --- a/src/common/Cargo.toml +++ b/src/common/Cargo.toml @@ -109,7 +109,7 @@ uuid = { version = "1", features = ["v4"] } [target.'cfg(not(madsim))'.dependencies] workspace-hack = { path = "../workspace-hack" } -http-body = "0.4.5" +http-body = "1.0.0" tower-layer = "0.3.2" tower-service = "0.3.2"