diff --git a/Cargo.lock b/Cargo.lock index 926099b5..e0c13b30 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -251,7 +251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "bytes", "futures-util", "http", @@ -260,7 +260,7 @@ dependencies = [ "hyper", "hyper-util", "itoa", - "matchit", + "matchit 0.7.3", "memchr", "mime", "percent-encoding", @@ -279,12 +279,41 @@ dependencies = [ ] [[package]] -name = "axum-client-ip" -version = "0.6.1" +name = "axum" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eefda7e2b27e1bda4d6fa8a06b50803b8793769045918bc37ad062d48a6efac" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" dependencies = [ - "axum", + "axum-core 0.5.0", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit 0.8.4", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tokio", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-client-ip" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff8ee1869817523c8f91c20bf17fd932707f66c2e7e0b0f811b29a227289562" +dependencies = [ + "axum 0.8.1", "forwarded-header-value", "serde", ] @@ -310,14 +339,33 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-extra" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04" dependencies = [ - "axum", - "axum-core", + "axum 0.7.9", + "axum-core 0.4.5", "bytes", "futures-util", "headers", @@ -753,7 +801,7 @@ dependencies = [ name = "conduwuit_api" version = "0.5.0" dependencies = [ - "axum", + "axum 0.7.9", "axum-client-ip", "axum-extra", "base64 0.22.1", @@ -787,7 +835,7 @@ version = "0.5.0" dependencies = [ "argon2", "arrayvec", - "axum", + "axum 0.7.9", "bytes", "bytesize", "cargo_toml", @@ -869,7 +917,7 @@ dependencies = [ name = "conduwuit_router" version = "0.5.0" dependencies = [ - "axum", + "axum 0.7.9", "axum-client-ip", "axum-server", "axum-server-dual-protocol", @@ -2490,6 +2538,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "maybe-rayon" version = "0.1.1" @@ -4757,7 +4811,7 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.7.9", "base64 0.22.1", "bytes", "h2", diff --git a/Cargo.toml b/Cargo.toml index ce483bbc..1c78f38a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,7 +115,7 @@ default-features = false version = "0.7" [workspace.dependencies.axum-client-ip] -version = "0.6.1" +version = "0.7.0" [workspace.dependencies.tower] version = "0.5.1"