From 1020d80c7f3defc1b6ae9309897c5f93016eab75 Mon Sep 17 00:00:00 2001
From: Luis Moreno <morenol@users.noreply.github.com>
Date: Sat, 2 Dec 2023 12:46:45 -0400
Subject: [PATCH] chore: update http crate

---
 actix-http-test/CHANGES.md | 1 +
 actix-http-test/Cargo.toml | 4 ++--
 actix-http/CHANGES.md      | 3 +++
 actix-http/Cargo.toml      | 8 ++++----
 actix-router/CHANGES.md    | 3 +++
 actix-router/Cargo.toml    | 4 ++--
 actix-web/CHANGES.md       | 1 +
 actix-web/Cargo.toml       | 2 +-
 awc/CHANGES.md             | 3 +++
 awc/Cargo.toml             | 8 ++++----
 10 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/actix-http-test/CHANGES.md b/actix-http-test/CHANGES.md
index 065141b20..528f26841 100644
--- a/actix-http-test/CHANGES.md
+++ b/actix-http-test/CHANGES.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
+- Updated `actix-tls` dependency to `4`.
 
 ## 3.1.0
 
diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml
index 0881e0bc4..0312f1501 100644
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -31,7 +31,7 @@ openssl = ["tls-openssl", "awc/openssl"]
 [dependencies]
 actix-service = "2"
 actix-codec = "0.5"
-actix-tls = "3"
+actix-tls = "4"
 actix-utils = "3"
 actix-rt = "2.2"
 actix-server = "2"
@@ -39,7 +39,7 @@ awc = { version = "3", default-features = false }
 
 bytes = "1"
 futures-core = { version = "0.3.17", default-features = false }
-http = "0.2.7"
+http = "1"
 log = "0.4"
 socket2 = "0.5"
 serde = "1"
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index fc49bc931..b2e54aa5d 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -5,6 +5,9 @@
 ### Changed
 
 - Updated `zstd` dependency to `0.13`.
+- Updated `http` dependency to `1`.
+- Updated `h2` dependency to `0.4`.
+- Updated `actix-tls` dependency to `4`.
 
 ### Fixed
 
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index f483ea093..85c98c2fe 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -75,7 +75,7 @@ bytestring = "1"
 derive_more = "0.99.5"
 encoding_rs = "0.8"
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
-http = "0.2.7"
+http = "1"
 httparse = "1.5.1"
 httpdate = "1.0.1"
 itoa = "1"
@@ -89,7 +89,7 @@ tokio-util = { version = "0.7", features = ["io", "codec"] }
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 # http2
-h2 = { version = "0.3.17", optional = true }
+h2 = { version = "0.4", optional = true }
 
 # websockets
 local-channel = { version = "0.1", optional = true }
@@ -98,7 +98,7 @@ rand = { version = "0.8", optional = true }
 sha1 = { version = "0.10", optional = true }
 
 # openssl/rustls
-actix-tls = { version = "3.1", default-features = false, optional = true }
+actix-tls = { version = "4", default-features = false, optional = true }
 
 # compress-*
 brotli = { version = "3.3.3", optional = true }
@@ -108,7 +108,7 @@ zstd = { version = "0.13", optional = true }
 [dev-dependencies]
 actix-http-test = { version = "3", features = ["openssl"] }
 actix-server = "2"
-actix-tls = { version = "3.1", features = ["openssl"] }
+actix-tls = { version = "4", features = ["openssl"] }
 actix-web = "4"
 
 async-stream = "0.3"
diff --git a/actix-router/CHANGES.md b/actix-router/CHANGES.md
index 31316ff47..948e97665 100644
--- a/actix-router/CHANGES.md
+++ b/actix-router/CHANGES.md
@@ -4,6 +4,9 @@
 
 - Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
 
+### Changed
+- Updated `http` dependency to `1`.
+
 ## 0.5.1
 
 - Correct typo in error string for `i32` deserialization. [#2876]
diff --git a/actix-router/Cargo.toml b/actix-router/Cargo.toml
index 8a404dd20..2cbb3c765 100644
--- a/actix-router/Cargo.toml
+++ b/actix-router/Cargo.toml
@@ -21,14 +21,14 @@ default = ["http"]
 
 [dependencies]
 bytestring = ">=0.1.5, <2"
-http = { version = "0.2.7", optional = true }
+http = { version = "1", optional = true }
 regex = "1.5"
 serde = "1"
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
 [dev-dependencies]
 criterion = { version = "0.5", features = ["html_reports"] }
-http = "0.2.7"
+http = "1"
 serde = { version = "1", features = ["derive"] }
 percent-encoding = "2.1"
 
diff --git a/actix-web/CHANGES.md b/actix-web/CHANGES.md
index 953befb7f..6f4af3066 100644
--- a/actix-web/CHANGES.md
+++ b/actix-web/CHANGES.md
@@ -6,6 +6,7 @@
 
 - Updated `zstd` dependency to `0.13`.
 - Compression middleware now prefers brotli over zstd over gzip.
+- Updated `actix-tls` dependency to `4`.
 
 ### Fixed
 
diff --git a/actix-web/Cargo.toml b/actix-web/Cargo.toml
index c9aab17b2..1f3a5d07a 100644
--- a/actix-web/Cargo.toml
+++ b/actix-web/Cargo.toml
@@ -73,7 +73,7 @@ actix-rt = { version = "2.6", default-features = false }
 actix-server = "2"
 actix-service = "2"
 actix-utils = "3"
-actix-tls = { version = "3.1", default-features = false, optional = true }
+actix-tls = { version = "4.0", default-features = false, optional = true }
 
 actix-http = { version = "3.4", features = ["ws"] }
 actix-router = "0.5"
diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index 3a1996cba..2ffddf8c4 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -4,6 +4,9 @@
 
 - Update `trust-dns-resolver` dependency to `0.23`.
 - Updated `zstd` dependency to `0.13`.
+- Updated `http` dependency to `1`.
+- Updated `h2` dependency to `0.4`.
+- Updated `actix-tls` dependency to `4`.
 
 ## 3.2.0
 
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index 07811c979..dc853c963 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -63,7 +63,7 @@ actix-codec = "0.5"
 actix-service = "2"
 actix-http = { version = "3.4", features = ["http2", "ws"] }
 actix-rt = { version = "2.1", default-features = false }
-actix-tls = { version = "3.1", features = ["connect", "uri"] }
+actix-tls = { version = "4.0", features = ["connect", "uri"] }
 actix-utils = "3"
 
 base64 = "0.21"
@@ -72,8 +72,8 @@ cfg-if = "1"
 derive_more = "0.99.5"
 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.17"
-http = "0.2.7"
+h2 = "0.4"
+http = "1"
 itoa = "1"
 log =" 0.4"
 mime = "0.3"
@@ -98,7 +98,7 @@ actix-http = { version = "3.4", features = ["openssl"] }
 actix-http-test = { version = "3", features = ["openssl"] }
 actix-server = "2"
 actix-test = { version = "0.1", features = ["openssl", "rustls-0_21"] }
-actix-tls = { version = "3", features = ["openssl", "rustls-0_21"] }
+actix-tls = { version = "4", features = ["openssl", "rustls-0_21"] }
 actix-utils = "3"
 actix-web = { version = "4", features = ["openssl"] }