diff --git a/Cargo.lock b/Cargo.lock index 7d6a0a492..77ed9aad7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -257,7 +257,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", + "http 0.2.11", "http-body", "hyper", "itoa", @@ -289,7 +289,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", + "http 0.2.11", "http-body", "mime", "rustversion", @@ -785,13 +785,13 @@ dependencies = [ "filetime", "foreign-types-shared", "futures", - "h2", + "h2 0.4.0", "hickory-client", "hickory-proto", "hickory-resolver", "hickory-server", "hmac", - "http", + "http 0.2.11", "httparse", "hyper", "hyper-boring", @@ -1582,17 +1582,36 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 1.9.3", + "http 0.2.11", + "indexmap 2.0.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.0.0", "slab", "tokio", "tokio-util", @@ -1640,7 +1659,7 @@ dependencies = [ "base64 0.21.5", "bytes", "headers-core", - "http", + "http 0.2.11", "httpdate", "mime", "sha1", @@ -1652,7 +1671,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.11", ] [[package]] @@ -1715,8 +1734,8 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "h2", - "http", + "h2 0.3.22", + "http 0.2.11", "idna 0.4.0", "ipnet", "once_cell", @@ -1768,10 +1787,10 @@ dependencies = [ "cfg-if", "enum-as-inner 0.6.0", "futures-util", - "h2", + "h2 0.3.22", "hickory-proto", "hickory-resolver", - "http", + "http 0.2.11", "rustls", "serde", "thiserror", @@ -1831,6 +1850,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" @@ -1838,7 +1868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] @@ -1876,8 +1906,8 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", + "h2 0.3.22", + "http 0.2.11", "http-body", "httparse", "httpdate", @@ -1897,7 +1927,7 @@ source = "git+https://github.com/Watfaq/boring.git?rev=24c006f#24c006fd8200bdf42 dependencies = [ "antidote", "boring", - "http", + "http 0.2.11", "hyper", "linked_hash_set", "once_cell", @@ -2562,7 +2592,7 @@ checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" dependencies = [ "async-trait", "bytes", - "http", + "http 0.2.11", "hyper", "opentelemetry", "tokio", @@ -2578,7 +2608,7 @@ dependencies = [ "futures-core", "futures-util", "headers", - "http", + "http 0.2.11", "hyper", "opentelemetry", "opentelemetry-http", @@ -3878,8 +3908,8 @@ dependencies = [ "axum", "base64 0.21.5", "bytes", - "h2", - "http", + "h2 0.3.22", + "http 0.2.11", "http-body", "hyper", "hyper-timeout", @@ -3924,7 +3954,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", + "http 0.2.11", "http-body", "http-range-header", "httpdate", @@ -4132,7 +4162,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", "httparse", "log", "rand", diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml index 327ad442a..6f6e0a8cc 100644 --- a/clash_lib/Cargo.toml +++ b/clash_lib/Cargo.toml @@ -28,7 +28,7 @@ lru_time_cache = "0.11" hyper = { version = "0.14", features = ["http1","http2","client", "server", "tcp"] } http = { version = "0.2" } httparse = "1.8.0" -h2 = "0.3" +h2 = "0.4" prost = "0.12" tower = { version = "0.4", features = ["util"] } libc = "0.2"