diff --git a/Cargo.toml b/Cargo.toml index f259aa0fb..9e2b78152 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,21 +60,21 @@ secure-cookies = ["actix-http/secure-cookies"] fail = ["actix-http/fail"] # openssl -openssl = ["open-ssl", "actix-tls/openssl", "awc/openssl"] +openssl = ["actix-tls/openssl", "awc/openssl"] # rustls -rustls = ["rust-tls", "actix-tls/rustls", "awc/rustls"] +rustls = ["actix-tls/rustls", "awc/rustls"] [dependencies] -actix-codec = "0.2.0-alpha.3" -actix-service = "1.0.0-alpha.4" -actix-utils = "1.0.0-alpha.3" +actix-codec = "0.2.0" +actix-service = "1.0.0" +actix-utils = "1.0.1" actix-router = "0.2.0" -actix-rt = "1.0.0-alpha.3" -actix-server = "1.0.0-alpha.4" -actix-testing = "1.0.0-alpha.3" +actix-rt = "1.0.0" +actix-server = "1.0.0" +actix-testing = "1.0.0" actix-threadpool = "0.3.0" -actix-tls = { version = "1.0.0-alpha.3" } +actix-tls = "1.0.0" actix-web-codegen = "0.2.0-alpha.2" actix-http = "1.0.0-alpha.4" @@ -96,19 +96,17 @@ serde_urlencoded = "0.6.1" time = "0.1.42" url = "2.1" -# ssl support -open-ssl = { version="0.10", package="openssl", optional = true } -rust-tls = { version = "0.16", package="rustls", optional = true } - [dev-dependencies] # actix = "0.8.3" -actix-connect = "1.0.0-alpha.3" +actix-connect = "1.0.0" actix-http-test = "1.0.0-alpha.3" rand = "0.7" env_logger = "0.6" serde_derive = "1.0" brotli = "3.3.0" flate2 = "1.0.2" +open-ssl = { version="0.10", package = "openssl" } +rust_tls = { version = "0.16.0", package = "rustls" } [profile.release] lto = true diff --git a/actix-cors/Cargo.toml b/actix-cors/Cargo.toml index 6f42109be..935166ebc 100644 --- a/actix-cors/Cargo.toml +++ b/actix-cors/Cargo.toml @@ -18,9 +18,9 @@ path = "src/lib.rs" [dependencies] actix-web = "2.0.0-alpha.3" -actix-service = "1.0.0-alpha.3" +actix-service = "1.0.0" derive_more = "0.99.2" futures = "0.3.1" [dev-dependencies] -actix-rt = "1.0.0-alpha.3" +actix-rt = "1.0.0" diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index fe351c22d..eb5f65ea0 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -20,7 +20,7 @@ path = "src/lib.rs" [dependencies] actix-web = { version = "2.0.0-alpha.3", default-features = false } actix-http = "1.0.0-alpha.3" -actix-service = "1.0.0-alpha.3" +actix-service = "1.0.0" bitflags = "1" bytes = "0.5.2" futures = "0.3.1" @@ -32,5 +32,5 @@ percent-encoding = "2.1" v_htmlescape = "0.4" [dev-dependencies] -actix-rt = "1.0.0-alpha.3" +actix-rt = "1.0.0" actix-web = { version = "2.0.0-alpha.3", features=["openssl"] } diff --git a/actix-framed/Cargo.toml b/actix-framed/Cargo.toml index ec8392ba3..b7e041765 100644 --- a/actix-framed/Cargo.toml +++ b/actix-framed/Cargo.toml @@ -20,10 +20,10 @@ name = "actix_framed" path = "src/lib.rs" [dependencies] -actix-codec = "0.2.0-alpha.3" -actix-service = "1.0.0-alpha.3" +actix-codec = "0.2.0" +actix-service = "1.0.0" actix-router = "0.2.0" -actix-rt = "1.0.0-alpha.3" +actix-rt = "1.0.0" actix-http = "1.0.0-alpha.3" bytes = "0.5.2" @@ -32,7 +32,7 @@ pin-project = "0.4.6" log = "0.4" [dev-dependencies] -actix-server = { version = "1.0.0-alpha.3" } -actix-connect = { version = "1.0.0-alpha.3", features=["openssl"] } +actix-server = "1.0.0" +actix-connect = { version = "1.0.0", features=["openssl"] } actix-http-test = { version = "1.0.0-alpha.3", features=["openssl"] } -actix-utils = "1.0.0-alpha.3" +actix-utils = "1.0.0" diff --git a/actix-framed/tests/test_server.rs b/actix-framed/tests/test_server.rs index 40e698c70..0e265d894 100644 --- a/actix-framed/tests/test_server.rs +++ b/actix-framed/tests/test_server.rs @@ -2,7 +2,7 @@ use actix_codec::{AsyncRead, AsyncWrite}; use actix_http::{body, http::StatusCode, ws, Error, HttpService, Response}; use actix_http_test::TestServer; use actix_service::{pipeline_factory, IntoServiceFactory, ServiceFactory}; -use actix_utils::framed::FramedTransport; +use actix_utils::framed::Dispatcher; use bytes::BytesMut; use futures::{future, SinkExt, StreamExt}; @@ -18,7 +18,7 @@ async fn ws_service( .send((res, body::BodySize::None).into()) .await .unwrap(); - FramedTransport::new(framed.into_framed(ws::Codec::new()), service) + Dispatcher::new(framed.into_framed(ws::Codec::new()), service) .await .unwrap(); diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index c3b228e70..8b9a1cc31 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-http" -version = "1.0.0-alpha.5" +version = "1.0.0-alpha.6" authors = ["Nikolay Kim "] description = "Actix http primitives" readme = "README.md" @@ -44,13 +44,13 @@ fail = ["failure"] secure-cookies = ["ring"] [dependencies] -actix-service = "1.0.0-alpha.4" -actix-codec = "0.2.0-alpha.3" -actix-connect = "1.0.0-alpha.3" -actix-utils = "1.0.0-alpha.3" -actix-rt = "1.0.0-alpha.3" +actix-service = "1.0.0" +actix-codec = "0.2.0" +actix-connect = "1.0.0" +actix-utils = "1.0.1" +actix-rt = "1.0.0" actix-threadpool = "0.3.0" -actix-tls = { version = "1.0.0-alpha.3", optional = true } +actix-tls = { version = "1.0.0", optional = true } base64 = "0.11" bitflags = "1.0" @@ -92,10 +92,10 @@ flate2 = { version="1.0.7", optional = true, default-features = false } failure = { version = "0.1.5", optional = true } [dev-dependencies] -actix-server = { version = "1.0.0-alpha.4" } -actix-connect = { version = "1.0.0-alpha.3", features=["openssl"] } +actix-server = "1.0.0" +actix-connect = { version = "1.0.0", features=["openssl"] } actix-http-test = { version = "1.0.0-alpha.3", features=["openssl"] } -actix-tls = { version = "1.0.0-alpha.3", features=["openssl"] } +actix-tls = { version = "1.0.0", features=["openssl"] } env_logger = "0.6" serde_derive = "1.0" open-ssl = { version="0.10", package = "openssl" } diff --git a/actix-http/src/ws/transport.rs b/actix-http/src/ws/dispatcher.rs similarity index 67% rename from actix-http/src/ws/transport.rs rename to actix-http/src/ws/dispatcher.rs index 101e8f65d..7a6b11b18 100644 --- a/actix-http/src/ws/transport.rs +++ b/actix-http/src/ws/dispatcher.rs @@ -4,19 +4,19 @@ use std::task::{Context, Poll}; use actix_codec::{AsyncRead, AsyncWrite, Framed}; use actix_service::{IntoService, Service}; -use actix_utils::framed::{FramedTransport, FramedTransportError}; +use actix_utils::framed; use super::{Codec, Frame, Message}; -pub struct Transport +pub struct Dispatcher where S: Service + 'static, T: AsyncRead + AsyncWrite, { - inner: FramedTransport, + inner: framed::Dispatcher, } -impl Transport +impl Dispatcher where T: AsyncRead + AsyncWrite, S: Service, @@ -24,26 +24,26 @@ where S::Error: 'static, { pub fn new>(io: T, service: F) -> Self { - Transport { - inner: FramedTransport::new(Framed::new(io, Codec::new()), service), + Dispatcher { + inner: framed::Dispatcher::new(Framed::new(io, Codec::new()), service), } } pub fn with>(framed: Framed, service: F) -> Self { - Transport { - inner: FramedTransport::new(framed, service), + Dispatcher { + inner: framed::Dispatcher::new(framed, service), } } } -impl Future for Transport +impl Future for Dispatcher where T: AsyncRead + AsyncWrite, S: Service, S::Future: 'static, S::Error: 'static, { - type Output = Result<(), FramedTransportError>; + type Output = Result<(), framed::DispatcherError>; fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { Pin::new(&mut self.inner).poll(cx) diff --git a/actix-http/src/ws/mod.rs b/actix-http/src/ws/mod.rs index 891d5110d..bc48c8e4e 100644 --- a/actix-http/src/ws/mod.rs +++ b/actix-http/src/ws/mod.rs @@ -13,15 +13,15 @@ use crate::message::RequestHead; use crate::response::{Response, ResponseBuilder}; mod codec; +mod dispatcher; mod frame; mod mask; mod proto; -mod transport; pub use self::codec::{Codec, Frame, Message}; +pub use self::dispatcher::Dispatcher; pub use self::frame::Parser; pub use self::proto::{hash_key, CloseCode, CloseReason, OpCode}; -pub use self::transport::Transport; /// Websocket protocol errors #[derive(Debug, Display, From)] diff --git a/actix-http/tests/test_ws.rs b/actix-http/tests/test_ws.rs index f0e0ff63c..6295ae283 100644 --- a/actix-http/tests/test_ws.rs +++ b/actix-http/tests/test_ws.rs @@ -1,7 +1,7 @@ use actix_codec::{AsyncRead, AsyncWrite, Framed}; use actix_http::{body, h1, ws, Error, HttpService, Request, Response}; use actix_http_test::TestServer; -use actix_utils::framed::FramedTransport; +use actix_utils::framed::Dispatcher; use bytes::BytesMut; use futures::future; use futures::{SinkExt, StreamExt}; @@ -16,7 +16,7 @@ async fn ws_service( .await .unwrap(); - FramedTransport::new(framed.into_framed(ws::Codec::new()), service) + Dispatcher::new(framed.into_framed(ws::Codec::new()), service) .await .map_err(|_| panic!()) } diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml index a9042dbf2..156b105d4 100644 --- a/actix-identity/Cargo.toml +++ b/actix-identity/Cargo.toml @@ -18,13 +18,13 @@ path = "src/lib.rs" [dependencies] actix-web = { version = "2.0.0-alpha.3", default-features = false, features = ["secure-cookies"] } -actix-service = "1.0.0-alpha.3" +actix-service = "1.0.0" futures = "0.3.1" serde = "1.0" serde_json = "1.0" time = "0.1.42" [dev-dependencies] -actix-rt = "1.0.0-alpha.3" +actix-rt = "1.0.0" actix-http = "1.0.0-alpha.3" bytes = "0.5.2" \ No newline at end of file diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml index ac1923155..82b98bc09 100644 --- a/actix-multipart/Cargo.toml +++ b/actix-multipart/Cargo.toml @@ -19,8 +19,8 @@ path = "src/lib.rs" [dependencies] actix-web = { version = "2.0.0-alpha.3", default-features = false } -actix-service = "1.0.0-alpha.3" -actix-utils = "1.0.0-alpha.3" +actix-service = "1.0.0" +actix-utils = "1.0.0" bytes = "0.5.2" derive_more = "0.99.2" httparse = "1.3" @@ -31,5 +31,5 @@ time = "0.1" twoway = "0.2" [dev-dependencies] -actix-rt = "1.0.0-alpha.3" +actix-rt = "1.0.0" actix-http = "1.0.0-alpha.3" \ No newline at end of file diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index d8b3ecc9d..ef8f40e7e 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -25,7 +25,7 @@ cookie-session = ["actix-web/secure-cookies"] [dependencies] actix-web = "2.0.0-alpha.3" -actix-service = "1.0.0-alpha.3" +actix-service = "1.0.0" bytes = "0.5.2" derive_more = "0.99.2" futures = "0.3.1" @@ -34,4 +34,4 @@ serde_json = "1.0" time = "0.1.42" [dev-dependencies] -actix-rt = "1.0.0-alpha.3" +actix-rt = "1.0.0" diff --git a/awc/Cargo.toml b/awc/Cargo.toml index 8c98efcb2..49cdb7828 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -39,10 +39,10 @@ flate2-zlib = ["actix-http/flate2-zlib"] flate2-rust = ["actix-http/flate2-rust"] [dependencies] -actix-codec = "0.2.0-alpha.3" -actix-service = "1.0.0-alpha.4" +actix-codec = "0.2.0" +actix-service = "1.0.0" actix-http = "1.0.0-alpha.4" -actix-rt = "1.0.0-alpha.3" +actix-rt = "1.0.0" base64 = "0.11" bytes = "0.5.2" @@ -59,13 +59,13 @@ open-ssl = { version="0.10", package="openssl", optional = true } rust-tls = { version = "0.16.0", package="rustls", optional = true, features = ["dangerous_configuration"] } [dev-dependencies] -actix-connect = { version = "1.0.0-alpha.3", features=["openssl"] } +actix-connect = { version = "1.0.0", features=["openssl"] } actix-web = { version = "2.0.0-alpha.3", features=["openssl"] } actix-http = { version = "1.0.0-alpha.4", features=["openssl"] } actix-http-test = { version = "1.0.0-alpha.3", features=["openssl"] } -actix-utils = "1.0.0-alpha.3" -actix-server = { version = "1.0.0-alpha.4" } -actix-tls = { version = "1.0.0-alpha.3", features=["openssl", "rustls"] } +actix-utils = "1.0.0" +actix-server = "1.0.0" +actix-tls = { version = "1.0.0", features=["openssl", "rustls"] } brotli = "3.3.0" flate2 = { version="1.0.2" } env_logger = "0.6" diff --git a/awc/tests/test_ws.rs b/awc/tests/test_ws.rs index 2f7ba2732..52dbb129c 100644 --- a/awc/tests/test_ws.rs +++ b/awc/tests/test_ws.rs @@ -42,7 +42,7 @@ async fn test_simple() { // start websocket service let framed = framed.into_framed(ws::Codec::new()); - ws::Transport::with(framed, ws_service).await + ws::Dispatcher::with(framed, ws_service).await } }) .finish(|_| ok::<_, Error>(Response::NotFound())) diff --git a/src/server.rs b/src/server.rs index 5212e0867..d6835ffa8 100644 --- a/src/server.rs +++ b/src/server.rs @@ -12,7 +12,7 @@ use futures::future::ok; use net2::TcpBuilder; #[cfg(feature = "openssl")] -use actix_tls::openssl::{SslAcceptor, SslAcceptorBuilder}; +use actix_tls::openssl::{AlpnError, SslAcceptor, SslAcceptorBuilder}; #[cfg(feature = "rustls")] use actix_tls::rustls::ServerConfig as RustlsServerConfig; @@ -549,8 +549,6 @@ fn create_tcp_listener( #[cfg(feature = "openssl")] /// Configure `SslAcceptorBuilder` with custom server flags. fn openssl_acceptor(mut builder: SslAcceptorBuilder) -> io::Result { - use open_ssl::ssl::AlpnError; - builder.set_alpn_select_callback(|_, protos| { const H2: &[u8] = b"\x02h2"; const H11: &[u8] = b"\x08http/1.1"; diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index 897a4bea0..274404018 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -30,13 +30,13 @@ default = [] openssl = ["open-ssl", "awc/openssl", ] # "actix-tls/openssl"] [dependencies] -actix-service = "1.0.0-alpha.3" -actix-codec = "0.2.0-alpha.3" -actix-connect = "1.0.0-alpha.3" -actix-utils = "1.0.0-alpha.3" -actix-rt = "1.0.0-alpha.3" -actix-server = "1.0.0-alpha.3" -actix-testing = "1.0.0-alpha.3" +actix-service = "1.0.0" +actix-codec = "0.2.0" +actix-connect = "1.0.0" +actix-utils = "1.0.0" +actix-rt = "1.0.0" +actix-server = "1.0.0" +actix-testing = "1.0.0" awc = "1.0.0-alpha.3" base64 = "0.11"