Merge branch 'master' into scope_work

actix · May 16, 2024 · c3af757 · c3af757
2 parents a3d6a49 + fff45b2
commit c3af757
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
@@ -4,6 +4,7 @@
 
 ### Changed
 
+- Update `brotli` dependency to `6`.
 - Minimum supported Rust version (MSRV) is now 1.72.
 
 ## 3.6.0

diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
@@ -114,7 +114,7 @@ sha1 = { version = "0.10", optional = true }
 actix-tls = { version = "3.3", default-features = false, optional = true }
 
 # compress-*
-brotli = { version = "3.3.3", optional = true }
+brotli = { version = "6", optional = true }
 flate2 = { version = "1.0.13", optional = true }
 zstd = { version = "0.13", optional = true }
 

diff --git a/actix-web/CHANGES.md b/actix-web/CHANGES.md
@@ -8,8 +8,12 @@
 
 ### Changed
 
+- Update `brotli` dependency to `6`.
 - Minimum supported Rust version (MSRV) is now 1.72.
-- Avoid type confusion in rare circumstances
+
+### Fixed
+
+- Avoid type confusion with `rustls` in some circumstances.
 
 ## 4.5.1
 

diff --git a/actix-web/Cargo.toml b/actix-web/Cargo.toml
@@ -125,7 +125,7 @@ actix-files = "0.6"
 actix-test = { version = "0.1", features = ["openssl", "rustls-0_22"] }
 awc = { version = "3", features = ["openssl"] }
 
-brotli = "3.3.3"
+brotli = "6"
 const-str = "0.5"
 criterion = { version = "0.5", features = ["html_reports"] }
 env_logger = "0.11"

diff --git a/awc/CHANGES.md b/awc/CHANGES.md
@@ -2,8 +2,8 @@
 
 ## Unreleased
 
+- Update `brotli` dependency to `6`.
 - Minimum supported Rust version (MSRV) is now 1.72.
-- Fix warning on 1.78 due to unused TlsConnectorService struct
 
 ## 3.4.0
 

diff --git a/awc/Cargo.toml b/awc/Cargo.toml
@@ -116,7 +116,7 @@ actix-tls = { version = "3.3", features = ["openssl", "rustls-0_22"] }
 actix-utils = "3"
 actix-web = { version = "4", features = ["openssl"] }
 
-brotli = "3.3.3"
+brotli = "6"
 const-str = "0.5"
 env_logger = "0.11"
 flate2 = "1.0.13"