diff --git a/crates/lib/actix_helpers/Cargo.toml b/crates/lib/actix_helpers/Cargo.toml index 65e5ead1a8..66e3958e0c 100644 --- a/crates/lib/actix_helpers/Cargo.toml +++ b/crates/lib/actix_helpers/Cargo.toml @@ -20,9 +20,9 @@ errors = { path = "../../lib/errors" } # Actix actix-http = "3.4.0" actix-rt = "2.9.0" -actix-service = "2.0.1" -actix-utils = "3.0.0" -actix-web = "4.0.0-beta.10" +actix-service = "2.0.2" +actix-utils = "3.0.1" +actix-web = "4.4.0" # IPv4 and v6 CIDRs (crate has few dependencies) cidr-utils = "0.5.11" diff --git a/crates/lib/deprecated/http_server_common/Cargo.toml b/crates/lib/deprecated/http_server_common/Cargo.toml index 3c4ee4a239..82f7101d72 100644 --- a/crates/lib/deprecated/http_server_common/Cargo.toml +++ b/crates/lib/deprecated/http_server_common/Cargo.toml @@ -27,9 +27,9 @@ once_cell = "1.18.0" regex = "1.5.4" # Web -actix-cors = "0.6.0-beta.3" +actix-cors = "0.6.4" actix-http = "3.4.0" -actix-web = "4.0.0-beta.10" +actix-web = "4.4.0" # Language language-tags = "0.3.2" # Parsing single tags richly diff --git a/crates/lib/url_config/Cargo.toml b/crates/lib/url_config/Cargo.toml index fcf49753dd..295e2fc059 100644 --- a/crates/lib/url_config/Cargo.toml +++ b/crates/lib/url_config/Cargo.toml @@ -19,6 +19,6 @@ http_server_common = { path = "../deprecated/http_server_common" } reusable_types = { path = "../../_types/reusable_types" } # External -actix-web = "4.0.0-beta.10" +actix-web = "4.4.0" anyhow = "1.0.75" my-workspace-hack = { version = "0.1", path = "../../../my-workspace-hack" } diff --git a/crates/service/job/email_sender_job/Cargo.toml b/crates/service/job/email_sender_job/Cargo.toml index e81a30619b..3f05ab77f3 100644 --- a/crates/service/job/email_sender_job/Cargo.toml +++ b/crates/service/job/email_sender_job/Cargo.toml @@ -74,7 +74,7 @@ tokio = { version = "1.6.0", features = ["macros"] } hyper = { version = "0.14.24" } # HTTP Server -actix-web = "4.0.0-beta.10" +actix-web = "4.4.0" # Serialization serde = "1.0.125" diff --git a/crates/service/job/inference_job/Cargo.toml b/crates/service/job/inference_job/Cargo.toml index a9ab89ec83..689c9dfb49 100644 --- a/crates/service/job/inference_job/Cargo.toml +++ b/crates/service/job/inference_job/Cargo.toml @@ -69,7 +69,7 @@ tokio = { version = "1.6.0", features = ["macros"] } hyper = { version = "0.14.24" } # HTTP Server -actix-web = "4.0.0-beta.10" +actix-web = "4.4.0" # Serialization serde = "1.0.125" diff --git a/crates/service/plugins/billing/Cargo.toml b/crates/service/plugins/billing/Cargo.toml index 8c6d59d8c8..fac7fcba86 100644 --- a/crates/service/plugins/billing/Cargo.toml +++ b/crates/service/plugins/billing/Cargo.toml @@ -31,9 +31,9 @@ once_cell = "1.18.0" regex = "1.5.4" # Web -actix-cors = "0.6.0-beta.3" +actix-cors = "0.6.4" actix-http = "3.4.0" -actix-web = "4.0.0-beta.10" +actix-web = "4.4.0" # Serialization serde = "1.0.125" diff --git a/crates/service/plugins/users/Cargo.toml b/crates/service/plugins/users/Cargo.toml index 5033ae7d05..d3ebc293a7 100644 --- a/crates/service/plugins/users/Cargo.toml +++ b/crates/service/plugins/users/Cargo.toml @@ -44,7 +44,7 @@ regex = "1.5.4" time = "0.2.26" # Web -actix-web = "4.0.0-beta.10" +actix-web = "4.4.0" jwt = "0.13.0" # Crypto @@ -69,4 +69,4 @@ sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", r2d2_redis = "0.14.0" byteorder = "1.5.0" strum_macros = "0.25.3" -my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } \ No newline at end of file +my-workspace-hack = { version = "0.1", path = "../../../../my-workspace-hack" } diff --git a/crates/service/web/dummy_service/Cargo.toml b/crates/service/web/dummy_service/Cargo.toml index e347c42d27..abbd3f4e96 100644 --- a/crates/service/web/dummy_service/Cargo.toml +++ b/crates/service/web/dummy_service/Cargo.toml @@ -37,9 +37,9 @@ futures-util = "0.3.29" # Web actix-http = "3.4.0" actix-rt = "2.9.0" -actix-service = "2.0.1" -actix-utils = "3.0.0" -actix-web = "4.0.0-beta.10" +actix-service = "2.0.2" +actix-utils = "3.0.1" +actix-web = "4.4.0" # Serialization serde = "1.0.125" diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index 219511dda8..5bfde36fd0 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -122,13 +122,13 @@ infer = "0.5.0" # https://github.com/durch/rust-s3/pull/254 rust-s3 = { version = "0.33.0" } -actix-cors = "0.6.0-beta.3" +actix-cors = "0.6.4" actix-http = "3.4.0" -actix-multipart = "0.4.0-beta.7" +actix-multipart = "0.6.1" actix-rt = "2.9.0" -actix-service = "2.0.1" -actix-utils = "3.0.0" -actix-web = "4.0.0-beta.10" +actix-service = "2.0.2" +actix-utils = "3.0.1" +actix-web = "4.4.0" jwt = "0.13.0" # NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/drain_multipart_request.rs index 3f6573ecba..971b782917 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/drain_multipart_request.rs @@ -34,7 +34,7 @@ pub async fn drain_multipart_request(mut multipart_payload: Multipart) -> Anyhow let mut field_name = None; let mut field_filename = None; - if let Some(content_disposition) = field.content_disposition() { + if let content_disposition = field.content_disposition() { field_name = content_disposition.get_name() .map(|s| s.to_string()); field_filename = content_disposition.get_filename() // NB: Only used for the file bytes. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/drain_multipart_request.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/drain_multipart_request.rs index 755988b96c..fedbe22939 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/drain_multipart_request.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_uploads/common/drain_multipart_request.rs @@ -37,7 +37,7 @@ pub async fn drain_multipart_request(mut multipart_payload: Multipart) -> Anyhow let mut field_name = None; let mut field_filename = None; - if let Some(content_disposition) = field.content_disposition() { + if let content_disposition = field.content_disposition() { field_name = content_disposition.get_name() .map(|s| s.to_string()); field_filename = content_disposition.get_filename() // NB: Only used for the file bytes. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs index b8b8c9d016..eee83b0dcc 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs @@ -146,7 +146,7 @@ pub async fn enqueue_infer_w2l_with_uploads( let mut field_name = "".to_string(); let mut filename = "".to_string(); - if let Some(content_disposition) = field.content_disposition() { + if let content_disposition = field.content_disposition() { field_name = content_disposition.get_name() .map(|s| s.to_string()) .unwrap_or("".to_string()); diff --git a/crates/service/web/websocket_gateway/Cargo.toml b/crates/service/web/websocket_gateway/Cargo.toml index 5c41a0de9b..78c05f9a53 100644 --- a/crates/service/web/websocket_gateway/Cargo.toml +++ b/crates/service/web/websocket_gateway/Cargo.toml @@ -70,13 +70,13 @@ native-tls = "0.2.8" # Web actix = "0.12.0" actix-cors = "0.5.4" -actix-files= "0.6.0-beta.8" +actix-files= "0.6.2" actix-http = "3.4.0" actix-rt = "2.9.0" -actix-service = "2.0.1" -actix-utils = "3.0.0" -actix-web = "4.0.0-beta.10" -actix-web-actors = "4.0.0-beta.7" +actix-service = "2.0.2" +actix-utils = "3.0.1" +actix-web = "4.4.0" +actix-web-actors = "4.2.0" # NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime # NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper.