1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2025-02-17 11:35:13 +00:00

Merge pull request #1395 from JohnTitor/rustls

Update `rustls` to 0.17
This commit is contained in:
Yuki Okushi 2020-03-04 15:56:27 +09:00 committed by GitHub
commit c8f0672ef7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 17 deletions

View file

@ -10,10 +10,10 @@
### Changed
* Use `sha-1` crate instead of unmaintained `sha1` crate
* Skip empty chunks when returning response from a `Stream` #1308
* Update the `time` dependency to 0.2.7
* Update `actix-tls` dependency to 2.0.0-alpha.1
* Update `rustls` dependency to 0.17
## [2.0.0] - 2019-12-25

View file

@ -68,7 +68,7 @@ actix-server = "1.0.0"
actix-testing = "1.0.0"
actix-macros = "0.1.0"
actix-threadpool = "0.3.1"
actix-tls = "1.0.0"
actix-tls = "2.0.0-alpha.1"
actix-web-codegen = "0.2.0"
actix-http = "2.0.0-alpha.1"
@ -90,7 +90,7 @@ serde_urlencoded = "0.6.1"
time = { version = "0.2.7", default-features = false, features = ["std"] }
url = "2.1"
open-ssl = { version="0.10", package = "openssl", optional = true }
rust-tls = { version = "0.16.0", package = "rustls", optional = true }
rust-tls = { version = "0.17.0", package = "rustls", optional = true }
[dev-dependencies]
actix = "0.10.0-alpha.1"

View file

@ -32,6 +32,6 @@ log = "0.4"
[dev-dependencies]
actix-server = "1.0.0"
actix-connect = { version = "1.0.0", features=["openssl"] }
actix-connect = { version = "2.0.0-alpha.1", features=["openssl"] }
actix-http-test = { version = "1.0.0", features=["openssl"] }
actix-utils = "1.0.3"

View file

@ -1,15 +1,19 @@
# Changes
## [2.0.0-alpha.2] - someday
### Changed
* Update `actix-connect` and `actix-tls` dependency to 2.0.0-alpha.1
## [2.0.0-alpha.1] - 2020-02-27
### Changed
* Update the `time` dependency to 0.2.7.
* Moved actors messages support from actix crate, enabled with feature `actors`.
* Breaking change: trait MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next().
* MessageBody is not implemented for &'static [u8] anymore.
### Fixed

View file

@ -45,11 +45,11 @@ actors = ["actix"]
[dependencies]
actix-service = "1.0.5"
actix-codec = "0.2.0"
actix-connect = "1.0.2"
actix-connect = "2.0.0-alpha.1"
actix-utils = "1.0.6"
actix-rt = "1.0.0"
actix-threadpool = "0.3.1"
actix-tls = { version = "1.0.0", optional = true }
actix-tls = { version = "2.0.0-alpha.1", optional = true }
actix = { version = "0.10.0-alpha.1", optional = true }
base64 = "0.11"
@ -94,15 +94,15 @@ fail-ure = { version = "0.1.5", package="failure", optional = true }
[dev-dependencies]
actix-server = "1.0.1"
actix-connect = { version = "1.0.2", features=["openssl"] }
actix-connect = { version = "2.0.0-alpha.1", features=["openssl"] }
actix-http-test = { version = "1.0.0", features=["openssl"] }
actix-tls = { version = "1.0.0", features=["openssl"] }
actix-tls = { version = "2.0.0-alpha.1", features=["openssl"] }
criterion = "0.3"
futures = "0.3.1"
env_logger = "0.7"
serde_derive = "1.0"
open-ssl = { version="0.10", package = "openssl" }
rust-tls = { version="0.16", package = "rustls" }
rust-tls = { version="0.17", package = "rustls" }
[[bench]]
name = "content-length"

View file

@ -51,16 +51,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.16.0", package="rustls", optional = true, features = ["dangerous_configuration"] }
rust-tls = { version = "0.17.0", package="rustls", optional = true, features = ["dangerous_configuration"] }
[dev-dependencies]
actix-connect = { version = "1.0.1", features=["openssl"] }
actix-connect = { version = "2.0.0-alpha.1", features=["openssl"] }
actix-web = { version = "2.0.0", features=["openssl"] }
actix-http = { version = "2.0.0-alpha.1", features=["openssl"] }
actix-http-test = { version = "1.0.0", features=["openssl"] }
actix-utils = "1.0.3"
actix-server = "1.0.0"
actix-tls = { version = "1.0.0", features=["openssl", "rustls"] }
actix-tls = { version = "2.0.0-alpha.1", features=["openssl", "rustls"] }
brotli2 = "0.3.2"
flate2 = "1.0.13"
futures = "0.3.1"

View file

@ -3,6 +3,7 @@
## [Unreleased] - 2020-xx-xx
* Update the `time` dependency to 0.2.7
* Update `actix-connect` dependency to 2.0.0-alpha.1
## [1.0.0] - 2019-12-13

View file

@ -32,7 +32,7 @@ openssl = ["open-ssl", "awc/openssl"]
[dependencies]
actix-service = "1.0.1"
actix-codec = "0.2.0"
actix-connect = "1.0.0"
actix-connect = "2.0.0-alpha.1"
actix-utils = "1.0.3"
actix-rt = "1.0.0"
actix-server = "1.0.0"