From d3208bf7a841908c4c623bdf79d6ee6bddd7324d Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Fri, 12 Apr 2019 12:28:18 -0700
Subject: [PATCH] Do not start default resolver immediately for default
 connector.

---
 actix-connect/CHANGES.md            |  7 +++++++
 actix-connect/Cargo.toml            |  6 +++---
 actix-connect/src/lib.rs            |  4 ++--
 actix-connect/tests/test_connect.rs | 14 ++++++--------
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/actix-connect/CHANGES.md b/actix-connect/CHANGES.md
index d1086e2a..ebf7dddf 100644
--- a/actix-connect/CHANGES.md
+++ b/actix-connect/CHANGES.md
@@ -1,5 +1,12 @@
 # Changes
 
+## [0.1.4] - 2019-04-12
+
+### Changed
+
+* Do not start default resolver immediately for default connector.
+
+
 ## [0.1.3] - 2019-04-11
 
 ### Changed
diff --git a/actix-connect/Cargo.toml b/actix-connect/Cargo.toml
index 4416be30..313bcae6 100644
--- a/actix-connect/Cargo.toml
+++ b/actix-connect/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-connect"
-version = "0.1.3"
+version = "0.1.4"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix Connector - tcp connector service"
 keywords = ["network", "framework", "async", "futures"]
@@ -48,8 +48,8 @@ tokio-openssl = { version="0.3", optional = true }
 
 [dev-dependencies]
 bytes = "0.4"
-actix-connect = { path=".", features=["ssl"] }
-actix-test-server = { version="0.2.0", features=["ssl"] }
+#actix-test-server = { version="0.2.0", features=["ssl"] }
+actix-test-server = { path="../actix-test-server", features=["ssl"] }
 actix-server-config = "0.1.0"
 actix-utils = "0.3.4"
 tokio-tcp = "0.1"
\ No newline at end of file
diff --git a/actix-connect/src/lib.rs b/actix-connect/src/lib.rs
index ccd537d9..8a1085f1 100644
--- a/actix-connect/src/lib.rs
+++ b/actix-connect/src/lib.rs
@@ -102,7 +102,7 @@ pub fn new_connector_factory<T: Address>(
 pub fn default_connector<T: Address>(
 ) -> impl Service<Request = Connect<T>, Response = Connection<T, TcpStream>, Error = ConnectError>
          + Clone {
-    Resolver::new(start_default_resolver()).and_then(TcpConnector::new())
+    Resolver::default().and_then(TcpConnector::new())
 }
 
 /// Create connector service factory with default parameters
@@ -112,5 +112,5 @@ pub fn default_connector_factory<T: Address>() -> impl NewService<
     Error = ConnectError,
     InitError = (),
 > + Clone {
-    ResolverFactory::new(start_default_resolver()).and_then(TcpConnectorFactory::new())
+    ResolverFactory::default().and_then(TcpConnectorFactory::new())
 }
diff --git a/actix-connect/tests/test_connect.rs b/actix-connect/tests/test_connect.rs
index 5c27bd9a..943919f8 100644
--- a/actix-connect/tests/test_connect.rs
+++ b/actix-connect/tests/test_connect.rs
@@ -9,6 +9,7 @@ use trust_dns_resolver::config::{ResolverConfig, ResolverOpts};
 
 use actix_connect::{default_connector, Connect};
 
+#[cfg(feature = "ssl")]
 #[test]
 fn test_string() {
     let mut srv = TestServer::with(|| {
@@ -19,11 +20,9 @@ fn test_string() {
         })
     });
 
-    let mut conn = srv
-        .block_on(lazy(|| Ok::<_, ()>(default_connector())))
-        .unwrap();
+    let mut conn = default_connector();
     let addr = format!("localhost:{}", srv.port());
-    let con = srv.block_on(conn.call(addr.into())).unwrap();
+    let con = srv.run_on(move || conn.call(addr.into())).unwrap();
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }
 
@@ -92,6 +91,7 @@ fn test_new_service() {
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }
 
+#[cfg(feature = "ssl")]
 #[test]
 fn test_uri() {
     let mut srv = TestServer::with(|| {
@@ -102,10 +102,8 @@ fn test_uri() {
         })
     });
 
-    let mut conn = srv
-        .block_on(lazy(|| Ok::<_, ()>(default_connector())))
-        .unwrap();
+    let mut conn = default_connector();
     let addr = Uri::try_from(format!("https://localhost:{}", srv.port())).unwrap();
-    let con = srv.block_on(conn.call(addr.into())).unwrap();
+    let con = srv.run_on(move || conn.call(addr.into())).unwrap();
     assert_eq!(con.peer_addr().unwrap(), srv.addr());
 }