actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-30 19:54:36 +01:00
Code Issues Releases Wiki Activity

prep alpha.1 release

Browse Source
This commit is contained in:
Nikolay Kim 2019-11-21 19:58:55 +06:00
parent ae4394c0f2
commit 5265714f68
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-connect/Cargo.toml
View File

@ -26,7 +26,7 @@ default = ["uri"]
# openssl # openssl
openssl = ["open-ssl", "tokio-openssl"] openssl = ["open-ssl", "tokio-openssl"]
#rustls # rustls
rustls = ["rust-tls", "tokio-rustls", "webpki"] rustls = ["rust-tls", "tokio-rustls", "webpki"]
# support http::Uri as connect address # support http::Uri as connect address
@ -50,7 +50,7 @@ trust-dns-resolver = { version="0.18.0-alpha.1", default-features = false }
open-ssl = { version="0.10", package = "openssl", optional = true } open-ssl = { version="0.10", package = "openssl", optional = true }
tokio-openssl = { version = "0.4.0-alpha.6", optional = true } tokio-openssl = { version = "0.4.0-alpha.6", optional = true }
#rustls # rustls
rust-tls = { version = "0.16.0", package = "rustls", optional = true } rust-tls = { version = "0.16.0", package = "rustls", optional = true }
# tokio-rustls = { version = "0.10.0", optional = true } # tokio-rustls = { version = "0.10.0", optional = true }
tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true } tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }

4
actix-server-config/Cargo.toml
View File

@ -22,8 +22,8 @@ openssl = ["tokio-openssl"]
rustls = ["tokio-rustls"] rustls = ["tokio-rustls"]
[dependencies] [dependencies]
tokio-io = "0.2.0-alpha.6" tokio-io = "=0.2.0-alpha.6"
tokio-net = "0.2.0-alpha.6" tokio-net = { version = "=0.2.0-alpha.6", features = ["tcp", "uds"] }
tokio-openssl = { version = "0.4.0-alpha.6", optional = true } tokio-openssl = { version = "0.4.0-alpha.6", optional = true }
#tokio-rustls = { version = "0.12.0-alpha.8", optional = true } #tokio-rustls = { version = "0.12.0-alpha.8", optional = true }
tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true } tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }

4
actix-server/Cargo.toml
View File

@ -24,7 +24,7 @@ path = "src/lib.rs"
default = [] default = []
nativetls = ["native-tls", "tokio-tls"] nativetls = ["native-tls", "tokio-tls"]
openssl = ["open-ssl", "tokio-openssl", "actix-server-config/openssl"] openssl = ["open-ssl", "tokio-openssl", "actix-server-config/openssl"]
rustls = ["rust-tls", "tokio-rustls", "webpki", "webpki-roots", "actix-server-config/rustls"] #rustls = ["rust-tls", "tokio-rustls", "webpki", "webpki-roots", "actix-server-config/rustls"]
[dependencies] [dependencies]
actix-rt = "1.0.0-alpha.1" actix-rt = "1.0.0-alpha.1"
@ -40,7 +40,7 @@ slab = "0.4"
tokio = "0.2.0-alpha.6" tokio = "0.2.0-alpha.6"
tokio-io = "0.2.0-alpha.6" tokio-io = "0.2.0-alpha.6"
tokio-net = { version = "0.2.0-alpha.6", features = ["signal"] } tokio-net = { version = "0.2.0-alpha.6", features = ["signal", "tcp", "uds"] }
tokio-timer = "0.3.0-alpha.6" tokio-timer = "0.3.0-alpha.6"
# unix domain sockets # unix domain sockets

2
actix-service/Cargo.toml
View File

@ -28,4 +28,4 @@ pin-project = "0.4.5"
[dev-dependencies] [dev-dependencies]
tokio = "0.2.0-alpha.6" tokio = "0.2.0-alpha.6"
actix-rt = "0.2" # actix-rt = "1.0.0-alpha.1"

2
actix-service/src/lib.rs
View File

@ -4,8 +4,6 @@ use std::rc::Rc;
use std::sync::Arc; use std::sync::Arc;
use std::task::{self, Context, Poll}; use std::task::{self, Context, Poll};
use futures::future::{ready, Ready};
mod and_then; mod and_then;
mod apply; mod apply;
mod apply_cfg; mod apply_cfg;

2
actix-threadpool/CHANGES.md
View File

@ -1,6 +1,6 @@
# Changes # Changes
## [0.2.0] - 2019-??-?? ## [0.2.0] - 2019-11-21
### Changed ### Changed