From ff2ca0f420a25b52c39d49b6a189230d26522b07 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Tue, 18 Aug 2020 00:28:39 +0900 Subject: [PATCH 1/3] Update rustls to 0.18 (#1637) --- CHANGES.md | 3 ++- Cargo.toml | 4 ++-- actix-http/CHANGES.md | 3 +++ actix-http/Cargo.toml | 10 +++++----- awc/CHANGES.md | 2 ++ awc/Cargo.toml | 6 +++--- test-server/Cargo.toml | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5d6b3b73d..087754856 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,8 @@ # Changes ## Unreleased - +### Changed +* Update `rustls` to 0.18 ## 3.0.0-beta.2 - 2020-08-17 ### Changed diff --git a/Cargo.toml b/Cargo.toml index 8b14e6602..e232f5eba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,7 +74,7 @@ actix-server = "1.0.0" actix-testing = "1.0.0" actix-macros = "0.1.0" actix-threadpool = "0.3.1" -actix-tls = "2.0.0-alpha.1" +actix-tls = "2.0.0-alpha.2" actix-web-codegen = "0.3.0-beta.1" actix-http = "2.0.0-beta.3" @@ -98,7 +98,7 @@ serde_urlencoded = "0.6.1" time = { version = "0.2.7", default-features = false, features = ["std"] } url = "2.1" open-ssl = { package = "openssl", version = "0.10", optional = true } -rust-tls = { package = "rustls", version = "0.17.0", optional = true } +rust-tls = { package = "rustls", version = "0.18.0", optional = true } tinyvec = { version = "0.3", features = ["alloc"] } [dev-dependencies] diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index f1d8ed000..e223f10c3 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -1,5 +1,8 @@ # Changes +## Unreleased + + ## [2.0.0-beta.3] - 2020-08-14 ### Fixed diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index d72024ac0..5b65e83a9 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -42,11 +42,11 @@ actors = ["actix"] [dependencies] actix-service = "1.0.5" actix-codec = "0.2.0" -actix-connect = "2.0.0-alpha.3" +actix-connect = "2.0.0-alpha.4" actix-utils = "1.0.6" actix-rt = "1.0.0" actix-threadpool = "0.3.1" -actix-tls = { version = "2.0.0-alpha.1", optional = true } +actix-tls = { version = "2.0.0-alpha.2", optional = true } actix = { version = "0.10.0-alpha.1", optional = true } base64 = "0.12" @@ -87,14 +87,14 @@ flate2 = { version = "1.0.13", optional = true } [dev-dependencies] actix-server = "1.0.1" -actix-connect = { version = "2.0.0-alpha.2", features = ["openssl"] } +actix-connect = { version = "2.0.0-alpha.4", features = ["openssl"] } actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] } -actix-tls = { version = "2.0.0-alpha.1", features = ["openssl"] } +actix-tls = { version = "2.0.0-alpha.2", features = ["openssl"] } criterion = "0.3" env_logger = "0.7" serde_derive = "1.0" open-ssl = { version="0.10", package = "openssl" } -rust-tls = { version="0.17", package = "rustls" } +rust-tls = { version="0.18", package = "rustls" } [[bench]] name = "content-length" diff --git a/awc/CHANGES.md b/awc/CHANGES.md index 3d2806a9f..90b44b367 100644 --- a/awc/CHANGES.md +++ b/awc/CHANGES.md @@ -1,6 +1,8 @@ # Changes ## Unreleased - 2020-xx-xx +### Changed +* Update `rustls` to 0.18 ## 2.0.0-beta.2 - 2020-07-21 diff --git a/awc/Cargo.toml b/awc/Cargo.toml index 27cf0d7ef..20ba40c32 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -54,16 +54,16 @@ serde = "1.0" serde_json = "1.0" serde_urlencoded = "0.6.1" open-ssl = { version = "0.10", package = "openssl", optional = true } -rust-tls = { version = "0.17.0", package = "rustls", optional = true, features = ["dangerous_configuration"] } +rust-tls = { version = "0.18.0", package = "rustls", optional = true, features = ["dangerous_configuration"] } [dev-dependencies] -actix-connect = { version = "2.0.0-alpha.2", features = ["openssl"] } +actix-connect = { version = "2.0.0-alpha.4", features = ["openssl"] } actix-web = { version = "3.0.0-beta.2", features = ["openssl"] } actix-http = { version = "2.0.0-beta.3", features = ["openssl"] } actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] } actix-utils = "1.0.3" actix-server = "1.0.0" -actix-tls = { version = "2.0.0-alpha.1", features = ["openssl", "rustls"] } +actix-tls = { version = "2.0.0-alpha.2", features = ["openssl", "rustls"] } brotli2 = "0.3.2" flate2 = "1.0.13" futures-util = { version = "0.3.5", default-features = false } diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index 946fa82bd..5746f9da3 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -31,7 +31,7 @@ openssl = ["open-ssl", "awc/openssl"] [dependencies] actix-service = "1.0.1" actix-codec = "0.2.0" -actix-connect = "2.0.0-alpha.2" +actix-connect = "2.0.0-alpha.4" actix-utils = "1.0.3" actix-rt = "1.0.0" actix-server = "1.0.0" From 5802eb797f812273443491227102e273d5052bb1 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Tue, 18 Aug 2020 01:08:40 +0900 Subject: [PATCH 2/3] awc,web: Bump up to next beta releases (#1638) --- CHANGES.md | 2 +- Cargo.toml | 4 ++-- actix-files/Cargo.toml | 4 ++-- actix-multipart/Cargo.toml | 2 +- actix-web-actors/Cargo.toml | 2 +- actix-web-codegen/Cargo.toml | 2 +- awc/CHANGES.md | 2 +- awc/Cargo.toml | 4 ++-- test-server/Cargo.toml | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 087754856..a44b04d40 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## Unreleased +## 3.0.0-beta.3 - 2020-08-17 ### Changed * Update `rustls` to 0.18 diff --git a/Cargo.toml b/Cargo.toml index e232f5eba..52d19c572 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-web" -version = "3.0.0-beta.2" +version = "3.0.0-beta.3" authors = ["Nikolay Kim "] description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust." readme = "README.md" @@ -78,7 +78,7 @@ actix-tls = "2.0.0-alpha.2" actix-web-codegen = "0.3.0-beta.1" actix-http = "2.0.0-beta.3" -awc = { version = "2.0.0-beta.1", default-features = false } +awc = { version = "2.0.0-beta.3", default-features = false } bytes = "0.5.3" derive_more = "0.99.2" diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index 06920bf79..c3444809e 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -17,7 +17,7 @@ name = "actix_files" path = "src/lib.rs" [dependencies] -actix-web = { version = "3.0.0-beta.2", default-features = false } +actix-web = { version = "3.0.0-beta.3", default-features = false } actix-http = "2.0.0-beta.3" actix-service = "1.0.1" bitflags = "1" @@ -33,4 +33,4 @@ v_htmlescape = "0.10" [dev-dependencies] actix-rt = "1.0.0" -actix-web = { version = "3.0.0-beta.2", features = ["openssl"] } +actix-web = { version = "3.0.0-beta.3", features = ["openssl"] } diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml index ecfdeb014..04c3415e0 100644 --- a/actix-multipart/Cargo.toml +++ b/actix-multipart/Cargo.toml @@ -16,7 +16,7 @@ name = "actix_multipart" path = "src/lib.rs" [dependencies] -actix-web = { version = "3.0.0-beta.2", default-features = false } +actix-web = { version = "3.0.0-beta.3", default-features = false } actix-service = "1.0.1" actix-utils = "1.0.3" bytes = "0.5.3" diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml index 773305880..a5f682cd5 100644 --- a/actix-web-actors/Cargo.toml +++ b/actix-web-actors/Cargo.toml @@ -17,7 +17,7 @@ path = "src/lib.rs" [dependencies] actix = "0.10.0-alpha.2" -actix-web = { version = "3.0.0-beta.2", default-features = false } +actix-web = { version = "3.0.0-beta.3", default-features = false } actix-http = "2.0.0-beta.3" actix-codec = "0.2.0" bytes = "0.5.2" diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml index 13b12fd6c..62cbf2941 100644 --- a/actix-web-codegen/Cargo.toml +++ b/actix-web-codegen/Cargo.toml @@ -20,5 +20,5 @@ proc-macro2 = "1" [dev-dependencies] actix-rt = "1.0.0" -actix-web = "3.0.0-beta.2" +actix-web = "3.0.0-beta.3" futures-util = { version = "0.3.5", default-features = false } diff --git a/awc/CHANGES.md b/awc/CHANGES.md index 90b44b367..f4b31aef6 100644 --- a/awc/CHANGES.md +++ b/awc/CHANGES.md @@ -1,6 +1,6 @@ # Changes -## Unreleased - 2020-xx-xx +## 2.0.0-beta.3 - 2020-08-17 ### Changed * Update `rustls` to 0.18 diff --git a/awc/Cargo.toml b/awc/Cargo.toml index 20ba40c32..d4d621025 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "awc" -version = "2.0.0-beta.2" +version = "2.0.0-beta.3" authors = ["Nikolay Kim "] description = "Async HTTP client library that uses the Actix runtime." readme = "README.md" @@ -58,7 +58,7 @@ rust-tls = { version = "0.18.0", package = "rustls", optional = true, features = [dev-dependencies] actix-connect = { version = "2.0.0-alpha.4", features = ["openssl"] } -actix-web = { version = "3.0.0-beta.2", features = ["openssl"] } +actix-web = { version = "3.0.0-beta.3", features = ["openssl"] } actix-http = { version = "2.0.0-beta.3", features = ["openssl"] } actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] } actix-utils = "1.0.3" diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index 5746f9da3..f3df6d1f6 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -36,7 +36,7 @@ actix-utils = "1.0.3" actix-rt = "1.0.0" actix-server = "1.0.0" actix-testing = "1.0.0" -awc = "2.0.0-alpha.2" +awc = "2.0.0-beta.3" base64 = "0.12" bytes = "0.5.3" @@ -52,5 +52,5 @@ time = { version = "0.2.7", default-features = false, features = ["std"] } open-ssl = { version = "0.10", package = "openssl", optional = true } [dev-dependencies] -actix-web = "3.0.0-beta.2" +actix-web = "3.0.0-beta.3" actix-http = "2.0.0-beta.3" From 3892a95c11a7a616e687191d3a4f1405bd96de76 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Tue, 18 Aug 2020 01:16:18 +0900 Subject: [PATCH 3/3] Fix actix-web version to publish --- awc/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awc/Cargo.toml b/awc/Cargo.toml index d4d621025..ea4450bb2 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -58,7 +58,7 @@ rust-tls = { version = "0.18.0", package = "rustls", optional = true, features = [dev-dependencies] actix-connect = { version = "2.0.0-alpha.4", features = ["openssl"] } -actix-web = { version = "3.0.0-beta.3", features = ["openssl"] } +actix-web = { version = "3.0.0-beta.2", features = ["openssl"] } actix-http = { version = "2.0.0-beta.3", features = ["openssl"] } actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] } actix-utils = "1.0.3"