From a5c2d0531b30bc6f80beba13dc2916b50e9787ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 20:40:14 +0000
Subject: [PATCH] build(deps): update brotli requirement from 6 to 7 (#3482)

* build(deps): update brotli requirement from 6 to 7

Updates the requirements on [brotli](https://github.com/dropbox/rust-brotli) to permit the latest version.
- [Release notes](https://github.com/dropbox/rust-brotli/releases)
- [Commits](https://github.com/dropbox/rust-brotli/commits)

---
updated-dependencies:
- dependency-name: brotli
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* docs: update changelogs

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rob Ede <robjtede@icloud.com>
---
 actix-http/CHANGES.md | 1 +
 actix-http/Cargo.toml | 2 +-
 actix-web/CHANGES.md  | 3 ++-
 actix-web/Cargo.toml  | 2 +-
 awc/CHANGES.md        | 1 +
 awc/Cargo.toml        | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index 95b51254b..2bbcebc07 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Update `brotli` dependency to `7`.
 - Minimum supported Rust version (MSRV) is now 1.75.
 
 ## 3.9.0
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index f910276f1..3f81ea9f0 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -139,7 +139,7 @@ sha1 = { version = "0.10", optional = true }
 actix-tls = { version = "3.4", default-features = false, optional = true }
 
 # compress-*
-brotli = { version = "6", optional = true }
+brotli = { version = "7", 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
index aca4ccfae..cee14dc4b 100644
--- a/actix-web/CHANGES.md
+++ b/actix-web/CHANGES.md
@@ -2,8 +2,9 @@
 
 ## Unreleased
 
+- On Windows, an error is now returned from `HttpServer::bind()` (or TLS variants) when binding to a socket that's already in use.
+- Update `brotli` dependency to `7`.
 - Minimum supported Rust version (MSRV) is now 1.75.
-- On Windows platforms, produce an error when invoking `HttpServer::bind` on a socket that's already in use. See [issue 2958](https://github.com/actix/actix-web/issues/2958).
 
 ## 4.9.0
 
diff --git a/actix-web/Cargo.toml b/actix-web/Cargo.toml
index f97eab7c9..ab70bf07c 100644
--- a/actix-web/Cargo.toml
+++ b/actix-web/Cargo.toml
@@ -172,7 +172,7 @@ actix-files = "0.6"
 actix-test = { version = "0.1", features = ["openssl", "rustls-0_23"] }
 awc = { version = "3", features = ["openssl"] }
 
-brotli = "6"
+brotli = "7"
 const-str = "0.5"
 core_affinity = "0.8"
 criterion = { version = "0.5", features = ["html_reports"] }
diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index 11cb150ab..8a2a1ec43 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Update `brotli` dependency to `7`.
 - Prevent panics on connection pool drop when Tokio runtime is shutdown early.
 - Minimum supported Rust version (MSRV) is now 1.75.
 
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index 849ca571f..c09f32ac8 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -141,7 +141,7 @@ actix-tls = { version = "3.4", features = ["openssl", "rustls-0_23"] }
 actix-utils = "3"
 actix-web = { version = "4", features = ["openssl"] }
 
-brotli = "6"
+brotli = "7"
 const-str = "0.5"
 env_logger = "0.11"
 flate2 = "1.0.13"