From 0bc4a5e7032b798114fa10dc4caf261495dcff22 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Fri, 8 May 2020 02:33:33 +0900 Subject: [PATCH 1/2] http: Bump up to 2.0.0-alpha.3 --- actix-http/CHANGES.md | 11 ++++++++--- actix-http/Cargo.toml | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index 43f189af..92302a66 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -1,16 +1,21 @@ # Changes -## [Unreleased] +## [2.0.0-alpha.3] - 2020-05-08 + +### Fixed + +* Correct spelling of ConnectError::Unresolved [#1487] +* Fix a mistake in the encoding of websocket continuation messages wherein + Item::FirstText and Item::FirstBinary are each encoded as the other. ### Changed * Implement `std::error::Error` for our custom errors [#1422] * Remove `failure` support for `ResponseError` since that crate will be deprecated in the near future. -* Fix a mistake in the encoding of websocket continuation messages wherein - Item::FirstText and Item::FirstBinary are each encoded as the other. [#1422]: https://github.com/actix/actix-web/pull/1422 +[#1487]: https://github.com/actix/actix-web/pull/1487 ## [2.0.0-alpha.2] - 2020-03-07 diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index b2c6b8e0..7e398f6f 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-http" -version = "2.0.0-alpha.2" +version = "2.0.0-alpha.3" authors = ["Nikolay Kim "] description = "Actix http primitives" readme = "README.md" @@ -42,7 +42,7 @@ actors = ["actix"] [dependencies] actix-service = "1.0.5" actix-codec = "0.2.0" -actix-connect = "2.0.0-alpha.2" +actix-connect = "2.0.0-alpha.3" actix-utils = "1.0.6" actix-rt = "1.0.0" actix-threadpool = "0.3.1" From 9d0c80b6ce13d92d8b3ec35a9d61c580134f6a77 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Fri, 8 May 2020 02:33:55 +0900 Subject: [PATCH 2/2] Update actix-http deps --- Cargo.toml | 2 +- actix-files/Cargo.toml | 2 +- actix-framed/Cargo.toml | 2 +- actix-multipart/Cargo.toml | 2 +- actix-web-actors/Cargo.toml | 2 +- awc/Cargo.toml | 4 ++-- test-server/Cargo.toml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7a0bef85..da836d17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,7 +81,7 @@ actix-threadpool = "0.3.1" actix-tls = "2.0.0-alpha.1" actix-web-codegen = "0.2.0" -actix-http = "2.0.0-alpha.2" +actix-http = "2.0.0-alpha.3" awc = { version = "2.0.0-alpha.1", default-features = false } bytes = "0.5.3" diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index ed887e32..4ddc89f3 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -19,7 +19,7 @@ path = "src/lib.rs" [dependencies] actix-web = { version = "3.0.0-alpha.1", default-features = false } -actix-http = "2.0.0-alpha.2" +actix-http = "2.0.0-alpha.3" actix-service = "1.0.1" bitflags = "1" bytes = "0.5.3" diff --git a/actix-framed/Cargo.toml b/actix-framed/Cargo.toml index adcda142..94009db6 100644 --- a/actix-framed/Cargo.toml +++ b/actix-framed/Cargo.toml @@ -23,7 +23,7 @@ actix-codec = "0.2.0" actix-service = "1.0.1" actix-router = "0.2.1" actix-rt = "1.0.0" -actix-http = "2.0.0-alpha.2" +actix-http = "2.0.0-alpha.3" bytes = "0.5.3" futures = "0.3.1" diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml index e81b07cb..6e5696e5 100644 --- a/actix-multipart/Cargo.toml +++ b/actix-multipart/Cargo.toml @@ -29,4 +29,4 @@ twoway = "0.2" [dev-dependencies] actix-rt = "1.0.0" -actix-http = "2.0.0-alpha.2" +actix-http = "2.0.0-alpha.3" diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml index 7e24d8c9..ccb41abb 100644 --- a/actix-web-actors/Cargo.toml +++ b/actix-web-actors/Cargo.toml @@ -18,7 +18,7 @@ path = "src/lib.rs" [dependencies] actix = "0.10.0-alpha.1" actix-web = "3.0.0-alpha.1" -actix-http = "2.0.0-alpha.2" +actix-http = "2.0.0-alpha.3" actix-codec = "0.2.0" bytes = "0.5.2" futures = "0.3.1" diff --git a/awc/Cargo.toml b/awc/Cargo.toml index fde136eb..782f6f00 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -36,7 +36,7 @@ compress = ["actix-http/compress"] [dependencies] actix-codec = "0.2.0" actix-service = "1.0.1" -actix-http = "2.0.0-alpha.2" +actix-http = "2.0.0-alpha.3" actix-rt = "1.0.0" base64 = "0.11" @@ -56,7 +56,7 @@ rust-tls = { version = "0.17.0", package="rustls", optional = true, features = [ [dev-dependencies] actix-connect = { version = "2.0.0-alpha.2", features=["openssl"] } actix-web = { version = "3.0.0-alpha.1", features=["openssl"] } -actix-http = { version = "2.0.0-alpha.2", features=["openssl"] } +actix-http = { version = "2.0.0-alpha.3", features=["openssl"] } actix-http-test = { version = "1.0.0", features=["openssl"] } actix-utils = "1.0.3" actix-server = "1.0.0" diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index 97581585..60b4127a 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -56,4 +56,4 @@ open-ssl = { version="0.10", package = "openssl", optional = true } [dev-dependencies] actix-web = "3.0.0-alpha.1" -actix-http = "2.0.0-alpha.2" +actix-http = "2.0.0-alpha.3"