From 3a456ec1489cc83a5a5bee74071d7139be44b8f6 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Mon, 4 Mar 2019 20:46:33 -0800
Subject: [PATCH] update actix-service dependency

---
 Cargo.toml             | 5 +++--
 src/h1/service.rs      | 6 +++---
 src/h2/service.rs      | 6 +++---
 test-server/Cargo.toml | 7 ++++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 35342b8e2..86a9c29cd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ session = ["cookie/secure"]
 ssl = ["openssl", "actix-connector/ssl"]
 
 [dependencies]
-actix-service = "0.3.1"
+actix-service = "0.3.2"
 actix-codec = "0.1.0"
 actix-connector = "0.3.0"
 actix-utils = "0.3.1"
@@ -78,7 +78,8 @@ openssl = { version="0.10", optional = true }
 
 [dev-dependencies]
 actix-rt = "0.1.0"
-actix-server = { version = "0.3.0", features=["ssl"] }
+#actix-server = { version = "0.3.0", features=["ssl"] }
+actix-server = { git="https://github.com/actix/actix-net.git", features=["ssl"] }
 actix-connector = { version = "0.3.0", features=["ssl"] }
 actix-http-test = { path="test-server", features=["ssl"] }
 env_logger = "0.6"
diff --git a/src/h1/service.rs b/src/h1/service.rs
index 4c1fb9a82..acc7217b0 100644
--- a/src/h1/service.rs
+++ b/src/h1/service.rs
@@ -6,7 +6,7 @@ use actix_codec::{AsyncRead, AsyncWrite, Framed};
 use actix_service::{IntoNewService, NewService, Service};
 use actix_utils::cloneable::CloneableService;
 use futures::future::{ok, FutureResult};
-use futures::{try_ready, Async, Future, Poll, Stream};
+use futures::{try_ready, Async, Future, IntoFuture, Poll, Stream};
 use log::error;
 
 use crate::body::MessageBody;
@@ -78,7 +78,7 @@ where
 
     fn new_service(&self, _: &()) -> Self::Future {
         H1ServiceResponse {
-            fut: self.srv.new_service(&()),
+            fut: self.srv.new_service(&()).into_future(),
             cfg: Some(self.cfg.clone()),
             _t: PhantomData,
         }
@@ -216,7 +216,7 @@ where
 
 #[doc(hidden)]
 pub struct H1ServiceResponse<T, S: NewService, B> {
-    fut: S::Future,
+    fut: <S::Future as IntoFuture>::Future,
     cfg: Option<ServiceConfig>,
     _t: PhantomData<(T, B)>,
 }
diff --git a/src/h2/service.rs b/src/h2/service.rs
index fcfc0be22..583f5edda 100644
--- a/src/h2/service.rs
+++ b/src/h2/service.rs
@@ -7,7 +7,7 @@ use actix_service::{IntoNewService, NewService, Service};
 use actix_utils::cloneable::CloneableService;
 use bytes::Bytes;
 use futures::future::{ok, FutureResult};
-use futures::{try_ready, Async, Future, Poll, Stream};
+use futures::{try_ready, Async, Future, IntoFuture, Poll, Stream};
 use h2::server::{self, Connection, Handshake};
 use h2::RecvStream;
 use log::error;
@@ -72,7 +72,7 @@ where
 
     fn new_service(&self, _: &()) -> Self::Future {
         H2ServiceResponse {
-            fut: self.srv.new_service(&()),
+            fut: self.srv.new_service(&()).into_future(),
             cfg: Some(self.cfg.clone()),
             _t: PhantomData,
         }
@@ -230,7 +230,7 @@ where
 
 #[doc(hidden)]
 pub struct H2ServiceResponse<T, S: NewService, B> {
-    fut: S::Future,
+    fut: <S::Future as IntoFuture>::Future,
     cfg: Option<ServiceConfig>,
     _t: PhantomData<(T, B)>,
 }
diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml
index cf4364c49..df56b8f3d 100644
--- a/test-server/Cargo.toml
+++ b/test-server/Cargo.toml
@@ -35,9 +35,10 @@ ssl = ["openssl", "actix-http/ssl", "actix-server/ssl"]
 actix-codec = "0.1"
 actix-rt = "0.1.0"
 actix-http = { path=".." }
-actix-service = "0.3.0"
-actix-server = "0.3.0"
-actix-utils = "0.3.0"
+actix-service = "0.3.2"
+#actix-server = "0.3.0"
+actix-server = { git="https://github.com/actix/actix-net.git" }
+actix-utils = "0.3.2"
 
 base64 = "0.10"
 bytes = "0.4"