From 8a3c4f902508f4631998667947af0642657993b0 Mon Sep 17 00:00:00 2001
From: Juan Aguilar Santillana <mhpoin@gmail.com>
Date: Mon, 2 Dec 2024 13:20:30 +0100
Subject: [PATCH] fix: update h2 and http crates and use workspace

---
 Cargo.toml                 | 4 ++++
 actix-http-test/Cargo.toml | 2 +-
 actix-http/Cargo.toml      | 4 ++--
 actix-router/Cargo.toml    | 4 ++--
 awc/Cargo.toml             | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d5601f8f1..bcd43faa3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,3 +59,7 @@ nonstandard_style = { level = "deny" }
 
 [workspace.lints.clippy]
 # clone_on_ref_ptr = { level = "deny" }
+
+[workspace.dependencies]
+http = "1.1.0"
+h2 = "0.4.7"
diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml
index 7ccb70a45..1dd7246ca 100644
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -47,7 +47,7 @@ awc = { version = "3", default-features = false }
 
 bytes = "1"
 futures-core = { version = "0.3.17", default-features = false }
-http = "0.2.7"
+http = { workspace = true }
 log = "0.4"
 socket2 = "0.5"
 serde = "1"
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 3f81ea9f0..8a60777ef 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -113,7 +113,7 @@ bytestring = "1"
 derive_more = { version = "1", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] }
 encoding_rs = "0.8"
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
-http = "0.2.7"
+http = { workspace = true }
 httparse = "1.5.1"
 httpdate = "1.0.1"
 itoa = "1"
@@ -127,7 +127,7 @@ tokio-util = { version = "0.7", features = ["io", "codec"] }
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 # http2
-h2 = { version = "0.3.26", optional = true }
+h2 = { workspace = true, optional = true }
 
 # websockets
 local-channel = { version = "0.1", optional = true }
diff --git a/actix-router/Cargo.toml b/actix-router/Cargo.toml
index 7def1bdb4..73914c350 100644
--- a/actix-router/Cargo.toml
+++ b/actix-router/Cargo.toml
@@ -26,7 +26,7 @@ unicode = ["dep:regex"]
 [dependencies]
 bytestring = ">=0.1.5, <2"
 cfg-if = "1"
-http = { version = "0.2.7", optional = true }
+http = { workspace = true, optional = true }
 regex = { version = "1.5", optional = true }
 regex-lite = "0.1"
 serde = "1"
@@ -34,7 +34,7 @@ tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 [dev-dependencies]
 criterion = { version = "0.5", features = ["html_reports"] }
-http = "0.2.7"
+http = { workspace = true }
 serde = { version = "1", features = ["derive"] }
 percent-encoding = "2.1"
 
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index c09f32ac8..bcf2d2288 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -109,8 +109,8 @@ cfg-if = "1"
 derive_more = { version = "1", features = ["display", "error", "from"] }
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc", "sink"] }
-h2 = "0.3.26"
-http = "0.2.7"
+h2 = { workspace = true }
+http = { workspace = true }
 itoa = "1"
 log =" 0.4"
 mime = "0.3"