Re-register task on every future poll

Add an error message if we receive a non-hostname-based dest

.travis.yml

@@ -10,7 +10,7 @@ matrix:
   include:
     - rust: stable
     - rust: beta
-    - rust: 1.36.0
+    - rust: 1.37.0
     - rust: nightly-2019-06-15
   allow_failures:
     - rust: nightly-2019-06-15

CHANGES.md

@@ -1,68 +0,0 @@
-# Changes
-
-## [0.3.0] - xxx
-
-* Split `Service` trait to separate crate
-
-* Use new `Service<Request>` trait
-
-
-## [0.2.4] - 2018-11-21
-
-### Added
-
-* Allow to skip name resolution stage in Connector
-
-
-## [0.2.3] - 2018-11-17
-
-### Added
-
-* Framed::is_write_buf_empty() checks if write buffer is flushed
-
-## [0.2.2] - 2018-11-14
-
-### Added
-
-* Add low/high caps to Framed
-
-### Changed
-
-* Refactor Connector and Resolver services
-
-
-### Fixed
-
-* Fix wrong service to socket binding
-
-
-## [0.2.0] - 2018-11-08
-
-### Added
-
-* Timeout service
-
-* Added ServiceConfig and ServiceRuntime for server service configuration
-
-
-### Changed
-
-* Connector has been refactored
-
-* timer and LowResTimer renamed to time and LowResTime
-
-* Refactored `Server::configure()` method
-
-
-## [0.1.1] - 2018-10-10
-
-### Changed
-
-- Set actix min version - 0.7.5
-
-- Set trust-dns min version
-
-
-## [0.1.0] - 2018-10-08
-
-* Initial impl

Cargo.toml

@@ -1,41 +1,27 @@
-[package]
-name = "actix-net"
-version = "0.3.0"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-description = "Actix net - framework for the composable network services for Rust"
-readme = "README.md"
-keywords = ["network", "framework", "async", "futures"]
-homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-net.git"
-documentation = "https://docs.rs/actix-net/"
-categories = ["network-programming", "asynchronous"]
-license = "MIT/Apache-2.0"
-exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"]
-edition = "2018"
-
 [workspace]
 members = [
   "actix-codec",
   "actix-connect",
+  "actix-ioframe",
   "actix-rt",
   "actix-service",
   "actix-server",
   "actix-server-config",
-  "actix-test-server",
+  "actix-testing",
   "actix-threadpool",
-  "actix-tower",
-  "actix-ioframe",
   "actix-utils",
   "router",
 ]
 
-[dev-dependencies]
-actix-service = "0.4.0"
-actix-codec = "0.1.1"
-actix-rt = "0.2.0"
-actix-server = { version="0.5.0", features=["ssl"] }
-env_logger = "0.6"
-futures = "0.1.25"
-openssl = "0.10"
-tokio-tcp = "0.1"
-tokio-openssl = "0.3"
+[patch.crates-io]
+actix-codec = { path = "actix-codec" }
+actix-connect = { path = "actix-connect" }
+actix-ioframe = { path = "actix-ioframe" }
+actix-rt = { path = "actix-rt" }
+actix-server = { path = "actix-server" }
+actix-server-config = { path = "actix-server-config" }
+actix-service = { path = "actix-service" }
+actix-testing = { path = "actix-testing" }
+actix-threadpool = { path = "actix-threadpool" }
+actix-utils = { path = "actix-utils" }
+actix-router = { path = "router" }

README.md

@@ -1,4 +1,4 @@
-# Actix net [![Build Status](https://travis-ci.org/actix/actix-net.svg?branch=master)](https://travis-ci.org/actix/actix-net) [![codecov](https://codecov.io/gh/actix/actix-net/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-net) [![crates.io](https://meritbadge.herokuapp.com/actix-net)](https://crates.io/crates/actix-net) [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# Actix net [![Build Status](https://travis-ci.org/actix/actix-net.svg?branch=master)](https://travis-ci.org/actix/actix-net) [![codecov](https://codecov.io/gh/actix/actix-net/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-net) [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Actix net - framework for composable network services
 
@@ -7,7 +7,7 @@ Actix net - framework for composable network services
 * [API Documentation (Development)](https://actix.rs/actix-net/actix_net/)
 * [Chat on gitter](https://gitter.im/actix/actix)
 * Cargo package: [actix-net](https://crates.io/crates/actix-net)
-* Minimum supported Rust version: 1.36 or later
+* Minimum supported Rust version: 1.37 or later
 
 ## Example
 

actix-codec/src/framed_read.rs

@@ -209,6 +209,7 @@ where
             // get a spurious 0 that looks like EOF
             self.buffer.reserve(1);
             if 0 == try_ready!(self.inner.read_buf(&mut self.buffer)) {
+                trace!("read 0 bytes, mark stream as eof");
                 self.eof = true;
             }
 

actix-connect/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## [0.3.0] - 2019-10-03
+
+### Changed
+
+* Update `rustls` to 0.16
+* Minimum required Rust version upped to 1.37.0
+
 ## [0.2.5] - 2019-09-05
 
 * Add `TcpConnectService`

actix-connect/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-connect"
-version = "0.2.5"
+version = "0.3.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix Connector - tcp connector service"
 keywords = ["network", "framework", "async", "futures"]
@@ -51,11 +51,11 @@ openssl = { version="0.10", optional = true }
 tokio-openssl = { version="0.3", optional = true }
 
 #rustls
-rustls = { version = "0.15.2", optional = true }
-tokio-rustls = { version = "0.9.1", optional = true }
-webpki = { version = "0.19", optional = true }
+rustls = { version = "0.16.0", optional = true }
+tokio-rustls = { version = "0.10.0", optional = true }
+webpki = { version = "0.21", optional = true }
 
 [dev-dependencies]
 bytes = "0.4"
-actix-test-server = { version="0.2.2", features=["ssl"] }
-actix-server-config = "0.1.0"
+actix-testing = { version="0.2.0" }
+actix-server-config = "0.2.0"

actix-connect/src/ssl/rustls.rs

@@ -5,10 +5,7 @@ use actix_codec::{AsyncRead, AsyncWrite};
 use actix_service::{NewService, Service};
 use futures::{future::ok, future::FutureResult, Async, Future, Poll};
 use std::sync::Arc;
-use tokio_rustls::{
-    rustls::{ClientConfig, ClientSession},
-    Connect, TlsConnector, TlsStream,
-};
+use tokio_rustls::{client::TlsStream, rustls::ClientConfig, Connect, TlsConnector};
 use webpki::DNSNameRef;
 
 use crate::{Address, Connection};
@@ -37,7 +34,7 @@ where
         connector: Arc<ClientConfig>,
     ) -> impl Service<
         Request = Connection<T, U>,
-        Response = Connection<T, TlsStream<U, ClientSession>>,
+        Response = Connection<T, TlsStream<U>>,
         Error = std::io::Error,
     > {
         RustlsConnectorService {
@@ -61,7 +58,7 @@ where
     U: AsyncRead + AsyncWrite + fmt::Debug,
 {
     type Request = Connection<T, U>;
-    type Response = Connection<T, TlsStream<U, ClientSession>>;
+    type Response = Connection<T, TlsStream<U>>;
     type Error = std::io::Error;
     type Config = ();
     type Service = RustlsConnectorService<T, U>;
@@ -86,7 +83,7 @@ where
     U: AsyncRead + AsyncWrite + fmt::Debug,
 {
     type Request = Connection<T, U>;
-    type Response = Connection<T, TlsStream<U, ClientSession>>;
+    type Response = Connection<T, TlsStream<U>>;
     type Error = std::io::Error;
     type Future = ConnectAsyncExt<T, U>;
 
@@ -97,7 +94,8 @@ where
     fn call(&mut self, stream: Connection<T, U>) -> Self::Future {
         trace!("SSL Handshake start for: {:?}", stream.host());
         let (io, stream) = stream.replace(());
-        let host = DNSNameRef::try_from_ascii_str(stream.host()).unwrap();
+        let host = DNSNameRef::try_from_ascii_str(stream.host())
+            .expect("rustls currently only handles hostname-based connections. See https://github.com/briansmith/webpki/issues/54");
         ConnectAsyncExt {
             fut: TlsConnector::from(self.connector.clone()).connect(host, io),
             stream: Some(stream),
@@ -114,7 +112,7 @@ impl<T: Address, U> Future for ConnectAsyncExt<T, U>
 where
     U: AsyncRead + AsyncWrite + fmt::Debug,
 {
-    type Item = Connection<T, TlsStream<U, ClientSession>>;
+    type Item = Connection<T, TlsStream<U>>;
     type Error = std::io::Error;
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {

actix-connect/tests/test_connect.rs

@@ -1,7 +1,7 @@
 use actix_codec::{BytesCodec, Framed};
 use actix_server_config::Io;
 use actix_service::{service_fn, NewService, Service};
-use actix_test_server::TestServer;
+use actix_testing::{self as test, TestServer};
 use bytes::Bytes;
 use futures::{future::lazy, Future, Sink};
 use http::{HttpTryFrom, Uri};
@@ -12,7 +12,7 @@ use actix_connect::{default_connector, Connect};
 #[cfg(feature = "ssl")]
 #[test]
 fn test_string() {
-    let mut srv = TestServer::with(|| {
+    let srv = TestServer::with(|| {
         service_fn(|io: Io<tokio_tcp::TcpStream>| {
             Framed::new(io.into_parts().0, BytesCodec)
                 .send(Bytes::from_static(b"test"))
@@ -22,14 +22,14 @@ fn test_string() {
 
     let mut conn = default_connector();
     let addr = format!("localhost:{}", srv.port());
-    let con = srv.run_on(move || conn.call(addr.into())).unwrap();
+    let con = test::call_service(&mut conn, addr.into());
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }
 
 #[cfg(feature = "rust-tls")]
 #[test]
 fn test_rustls_string() {
-    let mut srv = TestServer::with(|| {
+    let srv = TestServer::with(|| {
         service_fn(|io: Io<tokio_tcp::TcpStream>| {
             Framed::new(io.into_parts().0, BytesCodec)
                 .send(Bytes::from_static(b"test"))
@@ -39,12 +39,13 @@ fn test_rustls_string() {
 
     let mut conn = default_connector();
     let addr = format!("localhost:{}", srv.port());
-    let con = srv.run_on(move || conn.call(addr.into())).unwrap();
+    let con = test::call_service(&mut conn, addr.into());
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }
+
 #[test]
 fn test_static_str() {
-    let mut srv = TestServer::with(|| {
+    let srv = TestServer::with(|| {
         service_fn(|io: Io<tokio_tcp::TcpStream>| {
             Framed::new(io.into_parts().0, BytesCodec)
                 .send(Bytes::from_static(b"test"))
@@ -52,33 +53,29 @@ fn test_static_str() {
         })
     });
 
-    let resolver = srv
-        .block_on(lazy(
-            || Ok::<_, ()>(actix_connect::start_default_resolver()),
-        ))
-        .unwrap();
-    let mut conn = srv
-        .block_on(lazy(|| {
-            Ok::<_, ()>(actix_connect::new_connector(resolver.clone()))
-        }))
-        .unwrap();
+    let resolver = test::block_on(lazy(
+        || Ok::<_, ()>(actix_connect::start_default_resolver()),
+    ))
+    .unwrap();
 
-    let con = srv
-        .block_on(conn.call(Connect::with("10", srv.addr())))
-        .unwrap();
+    let mut conn = test::block_on(lazy(|| {
+        Ok::<_, ()>(actix_connect::new_connector(resolver.clone()))
+    }))
+    .unwrap();
+
+    let con = test::block_on(conn.call(Connect::with("10", srv.addr()))).unwrap();
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 
     let connect = Connect::new(srv.host().to_owned());
-    let mut conn = srv
-        .block_on(lazy(|| Ok::<_, ()>(actix_connect::new_connector(resolver))))
-        .unwrap();
-    let con = srv.block_on(conn.call(connect));
+    let mut conn =
+        test::block_on(lazy(|| Ok::<_, ()>(actix_connect::new_connector(resolver)))).unwrap();
+    let con = test::block_on(conn.call(connect));
     assert!(con.is_err());
 }
 
 #[test]
 fn test_new_service() {
-    let mut srv = TestServer::with(|| {
+    let srv = TestServer::with(|| {
         service_fn(|io: Io<tokio_tcp::TcpStream>| {
             Framed::new(io.into_parts().0, BytesCodec)
                 .send(Bytes::from_static(b"test"))
@@ -86,31 +83,27 @@ fn test_new_service() {
         })
     });
 
-    let resolver = srv
-        .block_on(lazy(|| {
-            Ok::<_, ()>(actix_connect::start_resolver(
-                ResolverConfig::default(),
-                ResolverOpts::default(),
-            ))
-        }))
-        .unwrap();
-    let factory = srv
-        .block_on(lazy(|| {
-            Ok::<_, ()>(actix_connect::new_connector_factory(resolver))
-        }))
-        .unwrap();
+    let resolver = test::block_on(lazy(|| {
+        Ok::<_, ()>(actix_connect::start_resolver(
+            ResolverConfig::default(),
+            ResolverOpts::default(),
+        ))
+    }))
+    .unwrap();
+    let factory = test::block_on(lazy(|| {
+        Ok::<_, ()>(actix_connect::new_connector_factory(resolver))
+    }))
+    .unwrap();
 
-    let mut conn = srv.block_on(factory.new_service(&())).unwrap();
-    let con = srv
-        .block_on(conn.call(Connect::with("10", srv.addr())))
-        .unwrap();
+    let mut conn = test::block_on(factory.new_service(&())).unwrap();
+    let con = test::block_on(conn.call(Connect::with("10", srv.addr()))).unwrap();
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }
 
 #[cfg(feature = "ssl")]
 #[test]
 fn test_uri() {
-    let mut srv = TestServer::with(|| {
+    let srv = TestServer::with(|| {
         service_fn(|io: Io<tokio_tcp::TcpStream>| {
             Framed::new(io.into_parts().0, BytesCodec)
                 .send(Bytes::from_static(b"test"))
@@ -120,14 +113,14 @@ fn test_uri() {
 
     let mut conn = default_connector();
     let addr = Uri::try_from(format!("https://localhost:{}", srv.port())).unwrap();
-    let con = srv.run_on(move || conn.call(addr.into())).unwrap();
+    let con = test::call_service(&mut conn, addr.into());
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }
 
 #[cfg(feature = "rust-tls")]
 #[test]
 fn test_rustls_uri() {
-    let mut srv = TestServer::with(|| {
+    let srv = TestServer::with(|| {
         service_fn(|io: Io<tokio_tcp::TcpStream>| {
             Framed::new(io.into_parts().0, BytesCodec)
                 .send(Bytes::from_static(b"test"))
@@ -137,6 +130,6 @@ fn test_rustls_uri() {
 
     let mut conn = default_connector();
     let addr = Uri::try_from(format!("https://localhost:{}", srv.port())).unwrap();
-    let con = srv.run_on(move || conn.call(addr.into())).unwrap();
+    let con = test::call_service(&mut conn, addr.into());
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }

actix-ioframe/CHANGES.md

@@ -1,5 +1,11 @@
 # Changes
 
-## [0.1.0] - 2019-07-17
+
+## [0.1.1] - 2019-10-14
+
+* Re-register task on every dispatcher poll.
+
+
+## [0.1.0] - 2019-09-25
 
 * Initial release

actix-ioframe/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "actix-ioframe"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix framed service"
 keywords = ["network", "framework", "async", "futures"]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-net.git"
-documentation = "https://docs.rs/actix-ioframed/"
+documentation = "https://docs.rs/actix-ioframe/"
 categories = ["network-programming", "asynchronous"]
 license = "MIT/Apache-2.0"
 exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"]
@@ -28,8 +28,8 @@ log = "0.4"
 
 [dev-dependencies]
 actix-rt = "0.2.2"
-actix-connect = "0.2.0"
-actix-test-server = "0.2.2"
-actix-server-config = "0.1.1"
+actix-connect = "0.3.0"
+actix-testing = "0.2.0"
+actix-server-config = "0.2.0"
 tokio-tcp = "0.1"
 tokio-timer = "0.2"

actix-ioframe/src/cell.rs

@@ -29,6 +29,10 @@ impl<T> Cell<T> {
         }
     }
 
+    pub(crate) unsafe fn get_ref(&mut self) -> &T {
+        &*self.inner.as_ref().get()
+    }
+
     pub(crate) unsafe fn get_mut(&mut self) -> &mut T {
         &mut *self.inner.as_ref().get()
     }

actix-ioframe/src/dispatcher.rs

@@ -147,13 +147,13 @@ where
                         }
                         Ok(Async::NotReady) => return false,
                         Ok(Async::Ready(None)) => {
+                            log::trace!("Client disconnected");
                             self.dispatch_state = FramedState::Stopping;
                             return true;
                         }
                     };
 
                     let mut cell = self.inner.clone();
-                    unsafe { cell.get_mut().task.register() };
                     tokio_current_thread::spawn(
                         self.service
                             .call(Item::new(self.state.clone(), self.sink.clone(), item))
@@ -274,6 +274,8 @@ where
     type Error = ServiceError<S::Error, U>;
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+        unsafe { self.inner.get_ref().task.register() };
+
         match mem::replace(&mut self.dispatch_state, FramedState::Processing) {
             FramedState::Processing => {
                 if self.poll_read() || self.poll_write() {

actix-ioframe/tests/test_server.rs

@@ -5,7 +5,7 @@ use std::time::Duration;
 use actix_codec::BytesCodec;
 use actix_server_config::Io;
 use actix_service::{new_apply_fn, Service};
-use actix_test_server::TestServer;
+use actix_testing::{self as test, TestServer};
 use futures::Future;
 use tokio_tcp::TcpStream;
 use tokio_timer::sleep;
@@ -19,7 +19,7 @@ fn test_disconnect() -> std::io::Result<()> {
     let disconnect = Arc::new(AtomicBool::new(false));
     let disconnect1 = disconnect.clone();
 
-    let mut srv = TestServer::with(move || {
+    let srv = TestServer::with(move || {
         let disconnect1 = disconnect1.clone();
 
         new_apply_fn(
@@ -41,15 +41,14 @@ fn test_disconnect() -> std::io::Result<()> {
         })
         .finish(|_t| Ok(None));
 
-    let conn = srv
-        .block_on(
-            actix_connect::default_connector()
-                .call(actix_connect::Connect::with(String::new(), srv.addr())),
-        )
-        .unwrap();
+    let conn = test::block_on(
+        actix_connect::default_connector()
+            .call(actix_connect::Connect::with(String::new(), srv.addr())),
+    )
+    .unwrap();
 
-    srv.block_on(client.call(conn.into_parts().0)).unwrap();
-    let _ = srv.block_on(
+    test::block_on(client.call(conn.into_parts().0)).unwrap();
+    let _ = test::block_on(
         sleep(Duration::from_millis(100))
             .map(|_| ())
             .map_err(|_| ()),

actix-rt/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## [0.2.6] - Unreleased
+
+### Fixed
+
+* Fix arbiter's thread panic message.
+
+
 ## [0.2.5] - 2019-09-02
 
 ### Added

actix-rt/src/arbiter.rs

@@ -260,9 +260,11 @@ struct ArbiterController {
 impl Drop for ArbiterController {
     fn drop(&mut self) {
         if thread::panicking() {
-            eprintln!("Panic in Arbiter thread, shutting down system.");
             if System::current().stop_on_panic() {
+                eprintln!("Panic in Arbiter thread, shutting down system.");
                 System::current().stop_with_code(1)
+            } else {
+                eprintln!("Panic in Arbiter thread.");
             }
         }
     }

actix-server-config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-server-config"
-version = "0.1.2"
+version = "0.2.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix server config utils"
 homepage = "https://actix.rs"
@@ -33,6 +33,6 @@ futures = "0.1.25"
 tokio-io = "0.1.12"
 tokio-tcp = "0.1"
 tokio-openssl = { version="0.3.0", optional = true }
-rustls = { version = "0.15.2", optional = true }
-tokio-rustls = { version = "0.9.1", optional = true }
+rustls = { version = "0.16.0", optional = true }
+tokio-rustls = { version = "0.10.0", optional = true }
 tokio-uds = { version="0.2.5", optional = true }

actix-server-config/changes.md

@@ -1,5 +1,12 @@
 # Changes
 
+## [0.2.0] - 2019-10-03
+
+### Changed
+
+* Update `rustls` to 0.16
+* Minimum required Rust version upped to 1.37.0
+
 ## [0.1.2] - 2019-07-18
 
 ### Added

actix-server-config/src/lib.rs

@@ -195,7 +195,7 @@ impl<T: IoStream> IoStream for tokio_openssl::SslStream<T> {
 }
 
 #[cfg(any(feature = "rust-tls"))]
-impl<T: IoStream> IoStream for tokio_rustls::TlsStream<T, rustls::ServerSession> {
+impl<T: IoStream> IoStream for tokio_rustls::server::TlsStream<T> {
     #[inline]
     fn peer_addr(&self) -> Option<net::SocketAddr> {
         self.get_ref().0.peer_addr()

actix-server/CHANGES.md

@@ -1,5 +1,19 @@
 # Changes
 
+## [0.7.0] - 2019-10-04
+
+### Changed
+
+* Update `rustls` to 0.16
+* Minimum required Rust version upped to 1.37.0
+
+## [0.6.1] - 2019-09-25
+
+### Added
+
+* Add UDS listening support to `ServerBuilder`
+
+
 ## [0.6.0] - 2019-07-18
 
 ### Added

actix-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-server"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix server - General purpose tcp server"
 keywords = ["network", "framework", "async", "futures"]
@@ -38,7 +38,7 @@ uds = ["mio-uds", "tokio-uds", "actix-server-config/uds"]
 [dependencies]
 actix-rt = "0.2.2"
 actix-service = "0.4.1"
-actix-server-config = "0.1.2"
+actix-server-config = "0.2.0"
 
 log = "0.4"
 num_cpus = "1.0"
@@ -65,10 +65,10 @@ openssl = { version="0.10", optional = true }
 tokio-openssl = { version="0.3", optional = true }
 
 # rustls
-rustls = { version = "0.15.2", optional = true }
-tokio-rustls = { version = "0.9.1", optional = true }
-webpki = { version = "0.19", optional = true }
-webpki-roots = { version = "0.16", optional = true }
+rustls = { version = "0.16.0", optional = true }
+tokio-rustls = { version = "0.10.0", optional = true }
+webpki = { version = "0.21", optional = true }
+webpki-roots = { version = "0.17", optional = true }
 
 [dev-dependencies]
 bytes = "0.4"

actix-server/src/builder.rs

@@ -185,20 +185,41 @@ impl ServerBuilder {
 
     #[cfg(all(unix, feature = "uds"))]
     /// Add new unix domain service to the server.
-    pub fn bind_uds<F, U, N>(mut self, name: N, addr: U, factory: F) -> io::Result<Self>
+    pub fn bind_uds<F, U, N>(self, name: N, addr: U, factory: F) -> io::Result<Self>
     where
         F: ServiceFactory<tokio_uds::UnixStream>,
         N: AsRef<str>,
         U: AsRef<std::path::Path>,
     {
-        use std::net::{IpAddr, Ipv4Addr, SocketAddr};
         use std::os::unix::net::UnixListener;
 
-        // TODO: need to do something with existing paths
-        let _ = std::fs::remove_file(addr.as_ref());
+        // The path must not exist when we try to bind.
+        // Try to remove it to avoid bind error.
+        if let Err(e) = std::fs::remove_file(addr.as_ref()) {
+            // NotFound is expected and not an issue. Anything else is.
+            if e.kind() != std::io::ErrorKind::NotFound {
+                return Err(e);
+            }
+        }
 
         let lst = UnixListener::bind(addr)?;
+        self.listen_uds(name, lst, factory)
+    }
 
+    #[cfg(all(unix, feature = "uds"))]
+    /// Add new unix domain service to the server.
+    /// Useful when running as a systemd service and
+    /// a socket FD can be acquired using the systemd crate.
+    pub fn listen_uds<F, N: AsRef<str>>(
+        mut self,
+        name: N,
+        lst: std::os::unix::net::UnixListener,
+        factory: F,
+    ) -> io::Result<Self>
+    where
+        F: ServiceFactory<tokio_uds::UnixStream>,
+    {
+        use std::net::{IpAddr, Ipv4Addr, SocketAddr};
         let token = self.token.next();
         let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080);
         self.services.push(StreamNewService::create(

actix-server/src/ssl/rustls.rs

@@ -4,9 +4,9 @@ use std::sync::Arc;
 
 use actix_service::{NewService, Service};
 use futures::{future::ok, future::FutureResult, Async, Future, Poll};
-use rustls::{ServerConfig, ServerSession};
+use rustls::ServerConfig;
 use tokio_io::{AsyncRead, AsyncWrite};
-use tokio_rustls::{Accept, TlsAcceptor, TlsStream};
+use tokio_rustls::{server::TlsStream, Accept, TlsAcceptor};
 
 use crate::counter::{Counter, CounterGuard};
 use crate::ssl::MAX_CONN_COUNTER;
@@ -41,7 +41,7 @@ impl<T, P> Clone for RustlsAcceptor<T, P> {
 
 impl<T: AsyncRead + AsyncWrite, P> NewService for RustlsAcceptor<T, P> {
     type Request = Io<T, P>;
-    type Response = Io<TlsStream<T, ServerSession>, P>;
+    type Response = Io<TlsStream<T>, P>;
     type Error = io::Error;
 
     type Config = SrvConfig;
@@ -70,7 +70,7 @@ pub struct RustlsAcceptorService<T, P> {
 
 impl<T: AsyncRead + AsyncWrite, P> Service for RustlsAcceptorService<T, P> {
     type Request = Io<T, P>;
-    type Response = Io<TlsStream<T, ServerSession>, P>;
+    type Response = Io<TlsStream<T>, P>;
     type Error = io::Error;
     type Future = RustlsAcceptorServiceFut<T, P>;
 
@@ -102,7 +102,7 @@ where
 }
 
 impl<T: AsyncRead + AsyncWrite, P> Future for RustlsAcceptorServiceFut<T, P> {
-    type Item = Io<TlsStream<T, ServerSession>, P>;
+    type Item = Io<TlsStream<T>, P>;
     type Error = io::Error;
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {

actix-test-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-test-server"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix test server"
 keywords = ["network", "framework", "async", "futures"]
@@ -11,31 +11,16 @@ categories = ["network-programming", "asynchronous"]
 license = "MIT/Apache-2.0"
 exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"]
 edition = "2018"
-workspace = ".."
-
-[package.metadata.docs.rs]
-features = ["ssl", "tls", "rust-tls"]
 
 [lib]
 name = "actix_test_server"
 path = "src/lib.rs"
 
-[features]
-default = []
-
-# tls
-tls = ["native-tls", "actix-server/tls"]
-
-# openssl
-ssl = ["openssl", "actix-server/ssl"]
-
-# rustls
-rust-tls = ["rustls", "tokio-rustls", "webpki", "webpki-roots"]
-
 [dependencies]
 actix-rt = "0.2.1"
 actix-server = "0.5.0"
-actix-server-config = "0.1.0"
+actix-server-config = "0.2.0"
+actix-testing = "0.1.0"
 
 log = "0.4"
 net2 = "0.2"
@@ -43,17 +28,5 @@ futures = "0.1"
 tokio-tcp = "0.1"
 tokio-reactor = "0.1"
 
-# native-tls
-native-tls = { version="0.2", optional = true }
-
-# openssl
-openssl = { version="0.10", optional = true }
-
-#rustls
-rustls = { version = "^0.15", optional = true }
-tokio-rustls = { version = "^0.9", optional = true }
-webpki = { version = "0.19", optional = true }
-webpki-roots = { version = "0.16", optional = true }
-
 [dev-dependencies]
 actix-service = "0.4.0"

actix-test-server/README.md

@@ -0,0 +1,3 @@
+# Actix test server (Deprecated)
+
+Use [actix-testing](https://docs.rs/actix-testing/) instead

actix-test-server/src/lib.rs

@@ -1,149 +1,2 @@
 //! Various helpers for Actix applications to use during testing.
-use std::sync::mpsc;
-use std::{net, thread};
-
-use actix_rt::{Runtime, System};
-use actix_server::{Server, StreamServiceFactory};
-pub use actix_server_config::{Io, ServerConfig};
-
-use futures::future::{lazy, Future, IntoFuture};
-use net2::TcpBuilder;
-use tokio_reactor::Handle;
-use tokio_tcp::TcpStream;
-
-/// The `TestServer` type.
-///
-/// `TestServer` is very simple test server that simplify process of writing
-/// integration tests for actix-net applications.
-///
-/// # Examples
-///
-/// ```rust
-/// use actix_service::{service_fn, IntoNewService};
-/// use actix_test_server::TestServer;
-///
-/// fn main() {
-///     let srv = TestServer::with(|| service_fn(
-///         |sock| {
-///             println!("New connection: {:?}", sock);
-///             Ok::<_, ()>(())
-///         }
-///     ));
-///
-///     println!("SOCKET: {:?}", srv.connect());
-/// }
-/// ```
-pub struct TestServer;
-
-/// Test server runstime
-pub struct TestServerRuntime {
-    addr: net::SocketAddr,
-    host: String,
-    port: u16,
-    rt: Runtime,
-}
-
-impl TestServer {
-    /// Start new test server with application factory
-    pub fn with<F: StreamServiceFactory>(factory: F) -> TestServerRuntime {
-        let (tx, rx) = mpsc::channel();
-
-        // run server in separate thread
-        thread::spawn(move || {
-            let sys = System::new("actix-test-server");
-            let tcp = net::TcpListener::bind("127.0.0.1:0").unwrap();
-            let local_addr = tcp.local_addr().unwrap();
-
-            Server::build()
-                .listen("test", tcp, factory)?
-                .workers(1)
-                .disable_signals()
-                .start();
-
-            tx.send((System::current(), local_addr)).unwrap();
-            sys.run()
-        });
-
-        let (system, addr) = rx.recv().unwrap();
-        System::set_current(system);
-
-        let rt = Runtime::new().unwrap();
-        let host = format!("{}", addr.ip());
-        let port = addr.port();
-
-        TestServerRuntime {
-            addr,
-            rt,
-            host,
-            port,
-        }
-    }
-
-    /// Get firat available unused local address
-    pub fn unused_addr() -> net::SocketAddr {
-        let addr: net::SocketAddr = "127.0.0.1:0".parse().unwrap();
-        let socket = TcpBuilder::new_v4().unwrap();
-        socket.bind(&addr).unwrap();
-        socket.reuse_address(true).unwrap();
-        let tcp = socket.to_tcp_listener().unwrap();
-        tcp.local_addr().unwrap()
-    }
-}
-
-impl TestServerRuntime {
-    /// Execute future on current runtime
-    pub fn block_on<F, I, E>(&mut self, fut: F) -> Result<I, E>
-    where
-        F: Future<Item = I, Error = E>,
-    {
-        self.rt.block_on(fut)
-    }
-
-    /// Runs the provided function, with runtime enabled.
-    pub fn run_on<F, R>(&mut self, f: F) -> Result<R::Item, R::Error>
-    where
-        F: FnOnce() -> R,
-        R: IntoFuture,
-    {
-        self.rt.block_on(lazy(|| f().into_future()))
-    }
-
-    /// Spawn future to the current runtime
-    pub fn spawn<F>(&mut self, fut: F)
-    where
-        F: Future<Item = (), Error = ()> + 'static,
-    {
-        self.rt.spawn(fut);
-    }
-
-    /// Test server host
-    pub fn host(&self) -> &str {
-        &self.host
-    }
-
-    /// Test server port
-    pub fn port(&self) -> u16 {
-        self.port
-    }
-
-    /// Get test server address
-    pub fn addr(&self) -> net::SocketAddr {
-        self.addr
-    }
-
-    /// Stop http server
-    fn stop(&mut self) {
-        System::current().stop();
-    }
-
-    /// Connect to server, return tokio TcpStream
-    pub fn connect(&self) -> std::io::Result<TcpStream> {
-        TcpStream::from_std(net::TcpStream::connect(self.addr)?, &Handle::default())
-    }
-}
-
-impl Drop for TestServerRuntime {
-    fn drop(&mut self) {
-        self.stop()
-    }
-}
+pub use actix_testing::*;

actix-testing/CHANGES.md

@@ -0,0 +1,10 @@
+# Changes
+
+## [0.2.0] - 2019-10-14
+
+* Upgrade actix-server and actix-server-config deps
+
+
+## [0.1.0] - 2019-09-25
+
+* Initial impl

actix-testing/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "actix-testing"
+version = "0.2.0"
+authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
+description = "Actix testing utils"
+keywords = ["network", "framework", "async", "futures"]
+homepage = "https://actix.rs"
+repository = "https://github.com/actix/actix-net.git"
+documentation = "https://docs.rs/actix-testing/"
+categories = ["network-programming", "asynchronous"]
+license = "MIT/Apache-2.0"
+edition = "2018"
+workspace = ".."
+
+[lib]
+name = "actix_testing"
+path = "src/lib.rs"
+
+[dependencies]
+actix-rt = "0.2.5"
+actix-server = "0.7.0"
+actix-server-config = "0.2.0"
+actix-service = "0.4.2"
+
+log = "0.4"
+net2 = "0.2"
+futures = "0.1"
+tokio-tcp = "0.1"
+tokio-reactor = "0.1"

actix-testing/README.md

@@ -0,0 +1,9 @@
+# Actix test utilities [![crates.io](https://meritbadge.herokuapp.com/actix-testing)](https://crates.io/crates/actix-testint) [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+## Documentation & community resources
+
+* [User Guide](https://actix.rs/docs/)
+* [API Documentation](https://docs.rs/actix-testing/)
+* [Chat on gitter](https://gitter.im/actix/actix)
+* Cargo package: [actix-http-test](https://crates.io/crates/actix-testing)
+* Minimum supported Rust version: 1.37 or later

actix-testing/src/lib.rs

@@ -0,0 +1,152 @@
+//! Various helpers for Actix applications to use during testing.
+use std::sync::mpsc;
+use std::{net, thread};
+
+use actix_rt::System;
+use actix_server::{Server, ServerBuilder, StreamServiceFactory};
+pub use actix_server_config::{Io, ServerConfig};
+
+use net2::TcpBuilder;
+use tokio_reactor::Handle;
+use tokio_tcp::TcpStream;
+
+mod rt;
+pub use self::rt::*;
+
+/// The `TestServer` type.
+///
+/// `TestServer` is very simple test server that simplify process of writing
+/// integration tests for actix-net applications.
+///
+/// # Examples
+///
+/// ```rust
+/// use actix_service::{service_fn, IntoNewService};
+/// use actix_testing::TestServer;
+///
+/// fn main() {
+///     let srv = TestServer::with(|| service_fn(
+///         |sock| {
+///             println!("New connection: {:?}", sock);
+///             Ok::<_, ()>(())
+///         }
+///     ));
+///
+///     println!("SOCKET: {:?}", srv.connect());
+/// }
+/// ```
+pub struct TestServer;
+
+/// Test server runstime
+pub struct TestServerRuntime {
+    addr: net::SocketAddr,
+    host: String,
+    port: u16,
+    system: System,
+}
+
+impl TestServer {
+    /// Start new server with server builder
+    pub fn new<F>(mut factory: F) -> TestServerRuntime
+    where
+        F: FnMut(ServerBuilder) -> ServerBuilder + Send + 'static,
+    {
+        let (tx, rx) = mpsc::channel();
+
+        // run server in separate thread
+        thread::spawn(move || {
+            let sys = System::new("actix-test-server");
+            factory(Server::build())
+                .workers(1)
+                .disable_signals()
+                .start();
+
+            tx.send(System::current()).unwrap();
+            sys.run()
+        });
+        let system = rx.recv().unwrap();
+
+        TestServerRuntime {
+            system,
+            addr: "127.0.0.1:0".parse().unwrap(),
+            host: "127.0.0.1".to_string(),
+            port: 0,
+        }
+    }
+
+    /// Start new test server with application factory
+    pub fn with<F: StreamServiceFactory<TcpStream>>(factory: F) -> TestServerRuntime {
+        let (tx, rx) = mpsc::channel();
+
+        // run server in separate thread
+        thread::spawn(move || {
+            let sys = System::new("actix-test-server");
+            let tcp = net::TcpListener::bind("127.0.0.1:0").unwrap();
+            let local_addr = tcp.local_addr().unwrap();
+
+            Server::build()
+                .listen("test", tcp, factory)?
+                .workers(1)
+                .disable_signals()
+                .start();
+
+            tx.send((System::current(), local_addr)).unwrap();
+            sys.run()
+        });
+
+        let (system, addr) = rx.recv().unwrap();
+
+        let host = format!("{}", addr.ip());
+        let port = addr.port();
+
+        TestServerRuntime {
+            system,
+            addr,
+            host,
+            port,
+        }
+    }
+
+    /// Get firat available unused local address
+    pub fn unused_addr() -> net::SocketAddr {
+        let addr: net::SocketAddr = "127.0.0.1:0".parse().unwrap();
+        let socket = TcpBuilder::new_v4().unwrap();
+        socket.bind(&addr).unwrap();
+        socket.reuse_address(true).unwrap();
+        let tcp = socket.to_tcp_listener().unwrap();
+        tcp.local_addr().unwrap()
+    }
+}
+
+impl TestServerRuntime {
+    /// Test server host
+    pub fn host(&self) -> &str {
+        &self.host
+    }
+
+    /// Test server port
+    pub fn port(&self) -> u16 {
+        self.port
+    }
+
+    /// Get test server address
+    pub fn addr(&self) -> net::SocketAddr {
+        self.addr
+    }
+
+    /// Stop http server
+    fn stop(&mut self) {
+        self.system.stop();
+    }
+
+    /// Connect to server, return tokio TcpStream
+    pub fn connect(&self) -> std::io::Result<TcpStream> {
+        TcpStream::from_std(net::TcpStream::connect(self.addr)?, &Handle::default())
+    }
+}
+
+impl Drop for TestServerRuntime {
+    fn drop(&mut self) {
+        self.stop()
+    }
+}

actix-testing/src/rt.rs

@@ -0,0 +1,116 @@
+//! Various helpers for Actix applications to use during testing.
+use std::cell::RefCell;
+
+use actix_rt::{System, SystemRunner};
+use actix_service::Service;
+use futures::future::{lazy, Future, IntoFuture};
+
+thread_local! {
+    static RT: RefCell<Inner> = {
+        RefCell::new(Inner(Some(System::builder().build())))
+    };
+}
+
+struct Inner(Option<SystemRunner>);
+
+impl Inner {
+    fn get_mut(&mut self) -> &mut SystemRunner {
+        self.0.as_mut().unwrap()
+    }
+}
+
+impl Drop for Inner {
+    fn drop(&mut self) {
+        std::mem::forget(self.0.take().unwrap())
+    }
+}
+
+/// Runs the provided future, blocking the current thread until the future
+/// completes.
+///
+/// This function can be used to synchronously block the current thread
+/// until the provided `future` has resolved either successfully or with an
+/// error. The result of the future is then returned from this function
+/// call.
+///
+/// Note that this function is intended to be used only for testing purpose.
+/// This function panics on nested call.
+pub fn block_on<F>(f: F) -> Result<F::Item, F::Error>
+where
+    F: IntoFuture,
+{
+    RT.with(move |rt| rt.borrow_mut().get_mut().block_on(f.into_future()))
+}
+
+/// Runs the provided function, blocking the current thread until the result
+/// future completes.
+///
+/// This function can be used to synchronously block the current thread
+/// until the provided `future` has resolved either successfully or with an
+/// error. The result of the future is then returned from this function
+/// call.
+///
+/// Note that this function is intended to be used only for testing purpose.
+/// This function panics on nested call.
+pub fn block_fn<F, R>(f: F) -> Result<R::Item, R::Error>
+where
+    F: FnOnce() -> R,
+    R: IntoFuture,
+{
+    RT.with(move |rt| rt.borrow_mut().get_mut().block_on(lazy(f)))
+}
+
+/// Spawn future to the current test runtime.
+pub fn spawn<F>(fut: F)
+where
+    F: Future<Item = (), Error = ()> + 'static,
+{
+    run_on(move || {
+        actix_rt::spawn(fut);
+    });
+}
+
+/// Runs the provided function, with runtime enabled.
+///
+/// Note that this function is intended to be used only for testing purpose.
+/// This function panics on nested call.
+pub fn run_on<F, R>(f: F) -> R
+where
+    F: FnOnce() -> R,
+{
+    RT.with(move |rt| {
+        rt.borrow_mut()
+            .get_mut()
+            .block_on(lazy(|| Ok::<_, ()>(f())))
+    })
+    .unwrap()
+}
+
+/// Calls service and waits for response future completion.
+///
+/// ```rust,ignore
+/// use actix_web::{test, App, HttpResponse, http::StatusCode};
+/// use actix_service::Service;
+///
+/// #[test]
+/// fn test_response() {
+///     let mut app = test::init_service(
+///         App::new()
+///             .service(web::resource("/test").to(|| HttpResponse::Ok()))
+///     );
+///
+///     // Create request object
+///     let req = test::TestRequest::with_uri("/test").to_request();
+///
+///     // Call application
+///     let resp = test::call_service(&mut app, req);
+///     assert_eq!(resp.status(), StatusCode::OK);
+/// }
+/// ```
+pub fn call_service<S, R>(app: &mut S, req: R) -> S::Response
+where
+    S: Service<Request = R>,
+    S::Error: std::fmt::Debug,
+{
+    block_on(run_on(move || app.call(req))).unwrap()
+}

actix-tower/CHANGES.md

@@ -1,2 +0,0 @@
-# Changes
-

actix-tower/Cargo.toml

@@ -1,29 +0,0 @@
-[package]
-name = "actix-tower"
-version = "0.1.0"
-authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Marcus Griep <marcus@griep.us>"]
-description = "Actix Tower"
-keywords = ["network", "framework", "async", "futures"]
-homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-net.git"
-documentation = "https://docs.rs/actix-tower/"
-categories = ["network-programming", "asynchronous"]
-license = "MIT/Apache-2.0"
-exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"]
-edition = "2018"
-workspace = ".."
-
-[badges]
-travis-ci = { repository = "actix/actix-tower", branch = "master" }
-appveyor = { repository = "actix/actix-net" }
-codecov = { repository = "actix/actix-tower", branch = "master", service = "github" }
-
-[lib]
-name = "actix_tower"
-path = "src/lib.rs"
-
-[dependencies]
-actix-service = "0.3.6"
-futures = "0.1.24"
-tower-service = "0.2.0"
-

actix-tower/src/lib.rs

@@ -1,580 +0,0 @@
-//! Utilities to provide interoperability between services based on the
-//! `actix-service` and `tower-service` crates.
-//!
-//! ## Example
-//!
-//! In the following example, we take a `RandomService`—which will always
-//! return 4—and wraps it with a middleware that will always add 1 to the
-//! result. This pattern can be further used to wrap services from either
-//! `tower-service` or `actix-service` with middleware provided by the other.
-//!
-//! ```
-//! use actix_tower::ActixServiceExt;
-//! # use futures::{Async, Future};
-//! use actix_service::Service;
-//!
-//! struct RandomService;
-//! impl Service for RandomService {
-//!     // …
-//! #    type Request = ();
-//! #    type Response = u32;
-//! #    type Error = ();
-//! #    type Future = futures::future::FutureResult<Self::Response, Self::Error>;
-//! #
-//! #    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
-//! #        Ok(Async::Ready(()))
-//! #    }
-//! #
-//! #    fn call(&mut self, _req: Self::Request) -> Self::Future {
-//! #        futures::finished(4)
-//! #     }
-//! }
-//!
-//! struct AddOneMiddleware<S>(S);
-//! impl<S, R> tower_service::Service<R> for AddOneMiddleware<S>
-//! where
-//!     S: tower_service::Service<R, Response = u32>,
-//!     S::Future: 'static,
-//! {
-//!     /// …
-//! #    type Response = u32;
-//! #    type Error = S::Error;
-//! #    type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error>>;
-//! #
-//! #    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
-//! #        self.0.poll_ready()
-//! #    }
-//! #
-//! #    fn call(&mut self, req: R) -> Self::Future {
-//! #        let fut = self.0.call(req).map(|x| x + 1);
-//! #        Box::new(fut)
-//! #    }
-//! }
-//!
-//! let mut s = RandomService.wrap_with_tower_middleware(AddOneMiddleware);
-//! assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-//! assert_eq!(Ok(Async::Ready(5)), s.call(()).poll());
-//! ```
-
-use actix_service::Service as ActixService;
-use std::marker::PhantomData;
-use tower_service::Service as TowerService;
-
-/// Compatibility wrapper associating a `tower_service::Service` with a particular
-/// `Request` type, so that it can be used as an `actix_service::Service`.
-///
-/// Generally created through convenience methods on the `TowerServiceExt<R>` trait.
-pub struct ActixCompat<S, R> {
-    inner: S,
-    _phantom: PhantomData<R>,
-}
-
-impl<S, R> ActixCompat<S, R> {
-    /// Wraps a `tower_service::Service` in a compatibility wrapper.
-    pub fn new(inner: S) -> Self {
-        ActixCompat {
-            inner,
-            _phantom: PhantomData,
-        }
-    }
-}
-
-/// Extension trait for wrapping a `tower_service::Service` instance for use as
-/// an `actix_service::Service`.
-pub trait TowerServiceExt<R>: TowerService<R> + Sized {
-    /// Wraps a `tower_service::Service` in a compatibility wrapper.
-    ///
-    /// ```
-    /// use actix_service::Service;
-    /// use actix_tower::TowerServiceExt;
-    /// # use futures::{Async, Future};
-    ///
-    /// struct RandomService;
-    /// impl<R> tower_service::Service<R> for RandomService {
-    ///     // …
-    /// #    type Response = u32;
-    /// #    type Error = ();
-    /// #    type Future = futures::future::FutureResult<Self::Response, Self::Error>;
-    /// #
-    /// #    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
-    /// #        Ok(Async::Ready(()))
-    /// #    }
-    /// #
-    /// #    fn call(&mut self, _req: R) -> Self::Future {
-    /// #        futures::finished(4)
-    /// #     }
-    /// }
-    ///
-    /// let mut s = RandomService.into_actix_service();
-    /// assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-    /// assert_eq!(Ok(Async::Ready(4)), s.call(()).poll());
-    /// ```
-    fn into_actix_service(self) -> ActixCompat<Self, R> {
-        ActixCompat::new(self)
-    }
-
-    /// Takes a function that, when provided with an `actix_service::Service` wraps it
-    /// and returns a new service. Useful for wrapping a `tower_service::Service` with
-    /// middleware built for `actix_service`.
-    ///
-    /// ```
-    /// use actix_tower::TowerServiceExt;
-    /// # use futures::{Async, Future};
-    /// use tower_service::Service;
-    ///
-    /// struct RandomService;
-    /// impl<R> Service<R> for RandomService {
-    ///     // …
-    /// #    type Response = u32;
-    /// #    type Error = ();
-    /// #    type Future = futures::future::FutureResult<Self::Response, Self::Error>;
-    /// #
-    /// #    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
-    /// #        Ok(Async::Ready(()))
-    /// #    }
-    /// #
-    /// #    fn call(&mut self, _req: R) -> Self::Future {
-    /// #        futures::finished(4)
-    /// #     }
-    /// }
-    ///
-    /// struct AddOneTransform<S>(S);
-    /// impl<S> actix_service::Service for AddOneTransform<S>
-    /// where
-    ///     S: actix_service::Service<Response = u32>,
-    ///     S::Future: 'static,
-    /// {
-    ///     /// …
-    /// #    type Request = S::Request;
-    /// #    type Response = u32;
-    /// #    type Error = S::Error;
-    /// #    type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error>>;
-    /// #
-    /// #    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
-    /// #        self.0.poll_ready()
-    /// #    }
-    /// #
-    /// #    fn call(&mut self, req: Self::Request) -> Self::Future {
-    /// #        let fut = self.0.call(req).map(|x| x + 1);
-    /// #        Box::new(fut)
-    /// #    }
-    /// }
-    ///
-    /// let mut s = RandomService.wrap_with_actix_middleware(AddOneTransform);
-    /// assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-    /// assert_eq!(Ok(Async::Ready(5)), s.call(()).poll());
-    /// ```
-    fn wrap_with_actix_middleware<F, U>(self, f: F) -> TowerCompat<U>
-    where
-        F: FnOnce(ActixCompat<Self, R>) -> U,
-        U: ActixService<Request = R>,
-    {
-        f(self.into_actix_service()).into_tower_service()
-    }
-}
-
-impl<S, R> TowerServiceExt<R> for S where S: TowerService<R> + Sized {}
-
-impl<S, R> ActixService for ActixCompat<S, R>
-where
-    S: TowerService<R>,
-{
-    type Request = R;
-    type Response = S::Response;
-    type Error = S::Error;
-    type Future = S::Future;
-
-    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
-        TowerService::poll_ready(&mut self.inner)
-    }
-
-    fn call(&mut self, req: Self::Request) -> Self::Future {
-        TowerService::call(&mut self.inner, req)
-    }
-}
-
-/// Compatibility wrapper associating an `actix_service::Service` with a particular
-/// `Request` type, so that it can be used as a `tower_service::Service`.
-///
-/// Generally created through convenience methods on the `ActixServiceExt<R>` trait.
-pub struct TowerCompat<S> {
-    inner: S,
-}
-
-impl<S> TowerCompat<S> {
-    /// Wraps an `actix_service::Service` in a compatibility wrapper.
-    pub fn new(inner: S) -> Self {
-        TowerCompat { inner }
-    }
-}
-
-/// Extension trait for wrapping an `actix_service::Service` instance for use as
-/// a `tower_service::Service`.
-pub trait ActixServiceExt: ActixService + Sized {
-    /// Wraps a `tower_service::Service` in a compatibility wrapper.
-    ///
-    /// ```
-    /// use actix_tower::ActixServiceExt;
-    /// # use futures::{Async, Future};
-    /// use tower_service::Service;
-    ///
-    /// struct RandomService;
-    /// impl actix_service::Service for RandomService {
-    ///     // …
-    /// #    type Request = ();
-    /// #    type Response = u32;
-    /// #    type Error = ();
-    /// #    type Future = futures::future::FutureResult<Self::Response, Self::Error>;
-    /// #
-    /// #    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
-    /// #        Ok(Async::Ready(()))
-    /// #    }
-    /// #
-    /// #    fn call(&mut self, _req: Self::Request) -> Self::Future {
-    /// #        futures::finished(4)
-    /// #     }
-    /// }
-    ///
-    /// let mut s = RandomService.into_tower_service();
-    /// assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-    /// assert_eq!(Ok(Async::Ready(4)), s.call(()).poll());
-    /// ```
-    fn into_tower_service(self) -> TowerCompat<Self> {
-        TowerCompat::new(self)
-    }
-
-    /// Takes a function that, when provided with a `tower_service::Service` wraps it
-    /// and returns a new service. Useful for wrapping an `actix_service::Service` with
-    /// middleware built for `tower_service`.
-    ///
-    /// ```
-    /// use actix_tower::ActixServiceExt;
-    /// # use futures::{Async, Future};
-    /// use actix_service::Service;
-    ///
-    /// struct RandomService;
-    /// impl Service for RandomService {
-    ///     // …
-    /// #    type Request = ();
-    /// #    type Response = u32;
-    /// #    type Error = ();
-    /// #    type Future = futures::future::FutureResult<Self::Response, Self::Error>;
-    /// #
-    /// #    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
-    /// #        Ok(Async::Ready(()))
-    /// #    }
-    /// #
-    /// #    fn call(&mut self, _req: Self::Request) -> Self::Future {
-    /// #        futures::finished(4)
-    /// #     }
-    /// }
-    ///
-    /// struct AddOneMiddleware<S>(S);
-    /// impl<S, R> tower_service::Service<R> for AddOneMiddleware<S>
-    /// where
-    ///     S: tower_service::Service<R, Response = u32>,
-    ///     S::Future: 'static,
-    /// {
-    ///     /// …
-    /// #    type Response = u32;
-    /// #    type Error = S::Error;
-    /// #    type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error>>;
-    /// #
-    /// #    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
-    /// #        self.0.poll_ready()
-    /// #    }
-    /// #
-    /// #    fn call(&mut self, req: R) -> Self::Future {
-    /// #        let fut = self.0.call(req).map(|x| x + 1);
-    /// #        Box::new(fut)
-    /// #    }
-    /// }
-    ///
-    /// let mut s = RandomService.wrap_with_tower_middleware(AddOneMiddleware);
-    /// assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-    /// assert_eq!(Ok(Async::Ready(5)), s.call(()).poll());
-    /// ```
-    fn wrap_with_tower_middleware<F, U>(self, f: F) -> ActixCompat<U, Self::Request>
-    where
-        F: FnOnce(TowerCompat<Self>) -> U,
-        U: TowerService<Self::Request>,
-    {
-        f(self.into_tower_service()).into_actix_service()
-    }
-}
-
-impl<S> ActixServiceExt for S where S: ActixService + Sized {}
-
-impl<S> TowerService<S::Request> for TowerCompat<S>
-where
-    S: ActixService,
-{
-    type Response = S::Response;
-    type Error = S::Error;
-    type Future = S::Future;
-
-    fn poll_ready(&mut self) -> futures::Poll<(), Self::Error> {
-        ActixService::poll_ready(&mut self.inner)
-    }
-
-    fn call(&mut self, req: S::Request) -> Self::Future {
-        ActixService::call(&mut self.inner, req)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    mod tower_service_into_actix_service {
-        use crate::TowerServiceExt;
-        use actix_service::{Service as ActixService, ServiceExt, Transform};
-        use futures::{future::FutureResult, Async, Future, Poll};
-        use tower_service::Service as TowerService;
-
-        #[test]
-        fn random_service_returns_4() {
-            let mut s = RandomService.into_actix_service();
-
-            assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-
-            assert_eq!(Ok(Async::Ready(4)), s.call(()).poll());
-        }
-
-        #[test]
-        fn random_service_can_combine() {
-            let mut s = RandomService.into_actix_service().map(|x| x + 1);
-
-            assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-
-            assert_eq!(Ok(Async::Ready(5)), s.call(()).poll());
-        }
-
-        #[test]
-        fn random_service_can_use_actix_middleware() {
-            let mut s = RandomService.wrap_with_actix_middleware(DoMathTransform);
-
-            assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-
-            assert_eq!(Ok(Async::Ready(68)), s.call(()).poll());
-        }
-
-        #[test]
-        fn random_service_and_add_service_chained() {
-            let s1 = RandomService.into_actix_service();
-            let s2 = AddOneService.into_actix_service();
-            let s3 = AddOneService.into_actix_service();
-
-            let mut s = s1.and_then(s2).and_then(s3);
-
-            assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-
-            assert_eq!(Ok(Async::Ready(6)), s.call(()).poll());
-        }
-
-        #[test]
-        fn random_service_and_add_service_and_ignoring_service_chained() {
-            let s1 = RandomService.into_actix_service();
-            let s2 = AddOneService.into_actix_service();
-            let s3 = AddOneService.into_actix_service();
-            let s4 = RandomService.into_actix_service();
-
-            let mut s = s1.and_then(s2).and_then(s3).and_then(s4);
-
-            assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-
-            assert_eq!(Ok(Async::Ready(4)), s.call(()).poll());
-        }
-
-        #[test]
-        fn random_service_can_be_transformed_to_do_math() {
-            let transform = DoMath;
-
-            let mut s = transform
-                .new_transform(RandomService.into_actix_service())
-                .wait()
-                .unwrap();
-
-            assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-
-            assert_eq!(Ok(Async::Ready(68)), s.call(()).poll());
-        }
-
-        struct RandomService;
-        impl<R> TowerService<R> for RandomService {
-            type Response = u32;
-            type Error = ();
-            type Future = FutureResult<Self::Response, Self::Error>;
-
-            fn poll_ready(&mut self) -> Poll<(), Self::Error> {
-                Ok(Async::Ready(()))
-            }
-
-            fn call(&mut self, _req: R) -> Self::Future {
-                futures::finished(4)
-            }
-        }
-
-        struct AddOneService;
-        impl TowerService<u32> for AddOneService {
-            type Response = u32;
-            type Error = ();
-            type Future = FutureResult<Self::Response, Self::Error>;
-
-            fn poll_ready(&mut self) -> Poll<(), Self::Error> {
-                Ok(Async::Ready(()))
-            }
-
-            fn call(&mut self, req: u32) -> Self::Future {
-                futures::finished(req + 1)
-            }
-        }
-
-        struct DoMathTransform<S>(S);
-        impl<S> ActixService for DoMathTransform<S>
-        where
-            S: ActixService<Response = u32>,
-            S::Future: 'static,
-        {
-            type Request = S::Request;
-            type Response = u32;
-            type Error = S::Error;
-            type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error>>;
-
-            fn poll_ready(&mut self) -> Poll<(), Self::Error> {
-                self.0.poll_ready()
-            }
-
-            fn call(&mut self, req: Self::Request) -> Self::Future {
-                let fut = self.0.call(req).map(|x| x * 17);
-                Box::new(fut)
-            }
-        }
-
-        struct DoMath;
-        impl<S> Transform<S> for DoMath
-        where
-            S: ActixService<Response = u32>,
-            S::Future: 'static,
-        {
-            type Request = S::Request;
-            type Response = u32;
-            type Error = S::Error;
-            type Transform = DoMathTransform<S>;
-            type InitError = ();
-            type Future = FutureResult<Self::Transform, Self::InitError>;
-
-            fn new_transform(&self, service: S) -> Self::Future {
-                futures::finished(DoMathTransform(service))
-            }
-        }
-    }
-
-    mod actix_service_into_tower_service {
-        use crate::{ActixServiceExt, TowerServiceExt};
-        use actix_service::{Service as ActixService, ServiceExt};
-        use futures::{future::FutureResult, Async, Future, Poll};
-        use tower_service::Service as TowerService;
-
-        #[test]
-        fn random_service_returns_4() {
-            let mut s = RandomService.into_tower_service();
-
-            assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-
-            assert_eq!(Ok(Async::Ready(4)), s.call(()).poll());
-        }
-
-        #[test]
-        fn random_service_can_use_tower_middleware() {
-            let mut s =
-                AddOneService::wrap(RandomService.into_tower_service()).into_actix_service();
-
-            assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-
-            assert_eq!(Ok(Async::Ready(5)), s.call(()).poll());
-        }
-
-        #[test]
-        fn do_math_service_can_use_tower_middleware() {
-            let mut s =
-                AddOneService::wrap(DoMathService.into_tower_service()).into_actix_service();
-
-            assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-
-            assert_eq!(Ok(Async::Ready(188)), s.call(11).poll());
-        }
-
-        #[test]
-        fn random_service_and_add_service_and_ignoring_service_chained() {
-            let s1 = RandomService.wrap_with_tower_middleware(AddOneService::wrap);
-            let s2 = DoMathService.wrap_with_tower_middleware(AddOneService::wrap);
-
-            let mut s = s1.and_then(s2);
-
-            assert_eq!(Ok(Async::Ready(())), s.poll_ready());
-
-            assert_eq!(Ok(Async::Ready(86)), s.call(()).poll());
-        }
-
-        struct RandomService;
-        impl ActixService for RandomService {
-            type Request = ();
-            type Response = u32;
-            type Error = ();
-            type Future = FutureResult<Self::Response, Self::Error>;
-
-            fn poll_ready(&mut self) -> Poll<(), Self::Error> {
-                Ok(Async::Ready(()))
-            }
-
-            fn call(&mut self, _req: Self::Request) -> Self::Future {
-                futures::finished(4)
-            }
-        }
-
-        struct AddOneService<S> {
-            inner: S,
-        }
-
-        impl<S> AddOneService<S> {
-            fn wrap(inner: S) -> Self {
-                AddOneService { inner }
-            }
-        }
-
-        impl<S, R> TowerService<R> for AddOneService<S>
-        where
-            S: TowerService<R, Response = u32>,
-            S::Future: 'static,
-        {
-            type Response = u32;
-            type Error = S::Error;
-            type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error>>;
-
-            fn poll_ready(&mut self) -> Poll<(), Self::Error> {
-                self.inner.poll_ready()
-            }
-
-            fn call(&mut self, req: R) -> Self::Future {
-                let fut = self.inner.call(req).map(|x| x + 1);
-
-                Box::new(fut)
-            }
-        }
-
-        struct DoMathService;
-        impl ActixService for DoMathService {
-            type Request = u32;
-            type Response = u32;
-            type Error = ();
-            type Future = FutureResult<Self::Response, Self::Error>;
-
-            fn poll_ready(&mut self) -> Poll<(), Self::Error> {
-                Ok(Async::Ready(()))
-            }
-
-            fn call(&mut self, req: Self::Request) -> Self::Future {
-                futures::finished(req * 17)
-            }
-        }
-    }
-}

actix-utils/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## [0.4.7] - 2019-10-14
+
+* Re-register task on every framed transport poll.
+
+
+## [0.4.6] - 2019-10-08
+
+* Refactor `Counter` type. register current task in available method.
+
+
 ## [0.4.5] - 2019-07-19
 
 ### Removed

actix-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-utils"
-version = "0.4.5"
+version = "0.4.7"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix utils - various actix net related services"
 keywords = ["network", "framework", "async", "futures"]

actix-utils/src/counter.rs

@@ -25,11 +25,13 @@ impl Counter {
         }))
     }
 
+    /// Get counter guard.
     pub fn get(&self) -> CounterGuard {
         CounterGuard::new(self.0.clone())
     }
 
-    /// Check if counter is not at capacity
+    /// Check if counter is not at capacity. If counter at capacity
+    /// it registers notification for current task.
     pub fn available(&self) -> bool {
         self.0.available()
     }
@@ -57,11 +59,7 @@ impl Drop for CounterGuard {
 
 impl CounterInner {
     fn inc(&self) {
-        let num = self.count.get() + 1;
-        self.count.set(num);
-        if num == self.capacity {
-            self.task.register();
-        }
+        self.count.set(self.count.get() + 1);
     }
 
     fn dec(&self) {
@@ -73,6 +71,11 @@ impl CounterInner {
     }
 
     fn available(&self) -> bool {
-        self.count.get() < self.capacity
+        if self.count.get() < self.capacity {
+            true
+        } else {
+            self.task.register();
+            false
+        }
     }
 }

actix-utils/src/framed.rs

@@ -129,7 +129,6 @@ where
                     };
 
                     let mut cell = self.inner.clone();
-                    cell.get_mut().task.register();
                     tokio_current_thread::spawn(self.service.call(item).then(move |item| {
                         let inner = cell.get_mut();
                         inner.buf.push_back(item);
@@ -293,6 +292,8 @@ where
     type Error = FramedTransportError<S::Error, U>;
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
+        self.inner.get_ref().task.register();
+
         match mem::replace(&mut self.state, TransportState::Processing) {
             TransportState::Processing => {
                 if self.poll_read() || self.poll_write() {

router/src/url.rs

@@ -195,7 +195,7 @@ fn from_hex(v: u8) -> Option<u8> {
 
 #[inline]
 fn restore_ch(d1: u8, d2: u8) -> Option<u8> {
-    from_hex(d1).and_then(|d1| from_hex(d2).and_then(move |d2| Some(d1 << 4 | d2)))
+    from_hex(d1).and_then(|d1| from_hex(d2).map(move |d2| d1 << 4 | d2))
 }
 
 #[cfg(test)]