From b9f54c87969d09b93ce2b50889bc9c5b6a41d8b8 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Tue, 10 Jan 2023 08:58:38 +0000
Subject: [PATCH] use secure tokio version range

see RUSTSEC-2023-0001

fixes #2962
---
 actix-http-test/Cargo.toml  | 2 +-
 actix-http/Cargo.toml       | 4 ++--
 actix-multipart/Cargo.toml  | 2 +-
 actix-test/Cargo.toml       | 2 +-
 actix-web-actors/Cargo.toml | 2 +-
 actix-web/Cargo.toml        | 2 +-
 awc/Cargo.toml              | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml
index 86338fb06..1162c0a38 100644
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -48,7 +48,7 @@ serde_json = "1.0"
 slab = "0.4"
 serde_urlencoded = "0.7"
 tls-openssl = { version = "0.10.9", package = "openssl", optional = true }
-tokio = { version = "1.8.4", features = ["sync"] }
+tokio = { version = "1.18.4", features = ["sync"] }
 
 [dev-dependencies]
 actix-web = { version = "4", default-features = false, features = ["cookies"] }
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 9f3977f0f..9939089b9 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -77,7 +77,7 @@ mime = "0.3"
 percent-encoding = "2.1"
 pin-project-lite = "0.2"
 smallvec = "1.6.1"
-tokio = { version = "1.13.1", features = [] }
+tokio = { version = "1.18.4", features = [] }
 tokio-util = { version = "0.7", features = ["io", "codec"] }
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }
 
@@ -119,7 +119,7 @@ serde_json = "1.0"
 static_assertions = "1"
 tls-openssl = { package = "openssl", version = "0.10.9" }
 tls-rustls = { package = "rustls", version = "0.20.0" }
-tokio = { version = "1.8.4", features = ["net", "rt", "macros"] }
+tokio = { version = "1.18.4", features = ["net", "rt", "macros"] }
 
 [[example]]
 name = "ws"
diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml
index 3226850db..4651d455b 100644
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -30,5 +30,5 @@ memchr = "2.5"
 actix-rt = "2.2"
 actix-http = "3"
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
-tokio = { version = "1.8.4", features = ["sync"] }
+tokio = { version = "1.18.4", features = ["sync"] }
 tokio-stream = "0.1"
diff --git a/actix-test/Cargo.toml b/actix-test/Cargo.toml
index 05d12c25a..d489d4a05 100644
--- a/actix-test/Cargo.toml
+++ b/actix-test/Cargo.toml
@@ -45,4 +45,4 @@ serde_json = "1"
 serde_urlencoded = "0.7"
 tls-openssl = { package = "openssl", version = "0.10.9", optional = true }
 tls-rustls = { package = "rustls", version = "0.20.0", optional = true }
-tokio = { version = "1.8.4", features = ["sync"] }
+tokio = { version = "1.18.4", features = ["sync"] }
diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml
index 633c3c373..2158f59e1 100644
--- a/actix-web-actors/Cargo.toml
+++ b/actix-web-actors/Cargo.toml
@@ -23,7 +23,7 @@ bytes = "1"
 bytestring = "1"
 futures-core = { version = "0.3.17", default-features = false }
 pin-project-lite = "0.2"
-tokio = { version = "1.13.1", features = ["sync"] }
+tokio = { version = "1.18.4", features = ["sync"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 
 [dev-dependencies]
diff --git a/actix-web/Cargo.toml b/actix-web/Cargo.toml
index 6078d5739..d1ae89c58 100644
--- a/actix-web/Cargo.toml
+++ b/actix-web/Cargo.toml
@@ -115,7 +115,7 @@ serde = { version = "1.0", features = ["derive"] }
 static_assertions = "1"
 tls-openssl = { package = "openssl", version = "0.10.9" }
 tls-rustls = { package = "rustls", version = "0.20.0" }
-tokio = { version = "1.13.1", features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.18.4", features = ["rt-multi-thread", "macros"] }
 zstd = "0.12"
 
 [[test]]
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index cf64eed49..41be3ef83 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -80,7 +80,7 @@ rand = "0.8"
 serde = "1.0"
 serde_json = "1.0"
 serde_urlencoded = "0.7"
-tokio = { version = "1.8.4", features = ["sync"] }
+tokio = { version = "1.18.4", features = ["sync"] }
 
 cookie = { version = "0.16", features = ["percent-encode"], optional = true }
 
@@ -106,7 +106,7 @@ futures-util = { version = "0.3.17", default-features = false }
 static_assertions = "1.1"
 rcgen = "0.9"
 rustls-pemfile = "1"
-tokio = { version = "1.13.1", features = ["rt-multi-thread", "macros"] }
+tokio = { version = "1.18.4", features = ["rt-multi-thread", "macros"] }
 zstd = "0.12"
 
 [[example]]