diff --git a/Cargo.lock b/Cargo.lock index 0c336e87a..42c82964a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -726,8 +726,8 @@ dependencies = [ "dropshot", "expectorate", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "omicron-common", "openapi-lint", "openapiv3", @@ -829,8 +829,8 @@ dependencies = [ "futures", "futures-core", "hex", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "hyper-staticfile", "itertools 0.12.0", "libc", @@ -970,8 +970,8 @@ dependencies = [ "expectorate", "futures", "hex", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "omicron-common", "openapi-lint", "openapiv3", @@ -1050,7 +1050,7 @@ dependencies = [ "getrandom", "hashbrown 0.14.2", "hex", - "hyper", + "hyper 0.14.27", "indexmap 2.1.0", "libc", "log", @@ -1330,8 +1330,8 @@ dependencies = [ "form_urlencoded", "futures", "hostname", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "indexmap 2.1.0", "multer", "openapiv3", @@ -1723,7 +1723,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 2.1.0", "slab", "tokio", @@ -1835,6 +1835,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" @@ -1842,10 +1853,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", "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" version = "0.1.5" @@ -1875,8 +1896,8 @@ dependencies = [ "crossbeam-channel", "form_urlencoded", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "log", "once_cell", "regex", @@ -1897,8 +1918,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -1910,6 +1931,19 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +dependencies = [ + "bytes", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1917,8 +1951,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "rustls", "tokio", "tokio-rustls", @@ -1926,15 +1960,15 @@ dependencies = [ [[package]] name = "hyper-staticfile" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318ca89e4827e7fe4ddd2824f52337239796ae8ecc761a663324407dc3d8d7e7" +checksum = "847250e0ccf0c0537daf49fc5c5ff69d43a752edbabc5274bc8322e8b092c55e" dependencies = [ "futures-util", - "http", + "http 1.0.0", "http-range", "httpdate", - "hyper", + "hyper 1.1.0", "mime_guess", "percent-encoding", "rand 0.8.5", @@ -1950,7 +1984,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", @@ -2315,7 +2349,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.11", "httparse", "log", "memchr", @@ -2614,7 +2648,7 @@ dependencies = [ "dropshot", "futures", "hex", - "http", + "http 0.2.11", "ipnetwork", "lazy_static", "macaddr", @@ -3198,7 +3232,7 @@ source = "git+https://github.com/oxidecomputer/progenitor?branch=main#9339b57628 dependencies = [ "getopts", "heck", - "http", + "http 0.2.11", "indexmap 2.1.0", "openapiv3", "proc-macro2", @@ -3566,9 +3600,9 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls", "hyper-tls", "ipnet", diff --git a/Cargo.toml b/Cargo.toml index a3a6eed32..6563953c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ hex = "0.4" http = "0.2.11" httptest = "0.15.5" hyper = { version = "0.14", features = [ "full" ] } -hyper-staticfile = "0.9" +hyper-staticfile = "0.10" indicatif = { version = "0.17.7", features = ["rayon"] } itertools = "0.12.0" libc = "0.2.151"