diff --git a/Cargo.lock b/Cargo.lock index 4f4fa019c19..29f79ca5a46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2914,6 +2914,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.4.1" @@ -3163,6 +3182,19 @@ dependencies = [ "http 1.1.0", ] +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "http-range" version = "0.1.5" @@ -3183,17 +3215,19 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "httptest" -version = "0.15.5" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b44a11846bda8c9fe9194f9924db7132c34635c7ce020f180f6c5d46d2308f" +checksum = "ae0fc8d140f1f0f3e7f821c8eff55cd13966db7a3370b2d9a7b08e9ec8ee8786" dependencies = [ - "bstr 0.2.17", + "bstr 1.9.1", "bytes", "crossbeam-channel", "form_urlencoded", "futures", - "http 0.2.12", - "hyper 0.14.28", + "http 1.1.0", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "log", "once_cell", "regex", @@ -3279,7 +3313,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -3302,9 +3336,11 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.5", "http 1.1.0", "http-body 1.0.0", "httparse", + "httpdate", "itoa", "pin-project-lite", "smallvec 1.13.2", @@ -5907,6 +5943,8 @@ dependencies = [ "hex", "hmac", "hyper 0.14.28", + "hyper 1.3.1", + "hyper-util", "indexmap 2.2.6", "inout", "ipnetwork", @@ -7721,7 +7759,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", diff --git a/Cargo.toml b/Cargo.toml index 4eb76f5859e..4ff70824332 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -288,7 +288,7 @@ hex-literal = "0.4.1" highway = "1.1.0" hkdf = "0.12.4" http = "0.2.12" -httptest = "0.15.5" +httptest = "0.16.1" hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main" } humantime = "2.1.0" hyper = "0.14" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 7880422c47a..9326a6b7540 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -60,7 +60,9 @@ group = { version = "0.13.0", default-features = false, features = ["alloc"] } hashbrown = { version = "0.14.5", features = ["raw"] } hex = { version = "0.4.3", features = ["serde"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } -hyper = { version = "0.14.28", features = ["full"] } +hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] } +hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.3.1", features = ["client", "http1", "http2", "server"] } +hyper-util = { version = "0.1.3", features = ["client-legacy", "http1", "http2", "server", "tokio"] } indexmap = { version = "2.2.6", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnetwork = { version = "0.20.0", features = ["schemars"] } @@ -165,7 +167,9 @@ group = { version = "0.13.0", default-features = false, features = ["alloc"] } hashbrown = { version = "0.14.5", features = ["raw"] } hex = { version = "0.4.3", features = ["serde"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } -hyper = { version = "0.14.28", features = ["full"] } +hyper-582f2526e08bb6a0 = { package = "hyper", version = "0.14.28", features = ["full"] } +hyper-dff4ba8e3ae991db = { package = "hyper", version = "1.3.1", features = ["client", "http1", "http2", "server"] } +hyper-util = { version = "0.1.3", features = ["client-legacy", "http1", "http2", "server", "tokio"] } indexmap = { version = "2.2.6", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnetwork = { version = "0.20.0", features = ["schemars"] }