From 42277c5c8f8a3db0fa1e0b445235154e4f87a9fc Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sat, 26 Jan 2019 22:09:26 -0800
Subject: [PATCH] update deps

---
 Cargo.toml          | 10 +++++-----
 src/h1/decoder.rs   |  5 ++---
 src/ws/transport.rs |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a5fc597a4..c7622fe2d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ session = ["cookie/secure"]
 ssl = ["openssl", "actix-connector/ssl"]
 
 [dependencies]
-actix-service = "0.1.3"
+actix-service = "0.1.6"
 actix-codec = "0.1.0"
 actix-connector = "0.1.0"
 actix-rt = "0.1.0"
@@ -50,7 +50,7 @@ actix-utils = "0.1.0"
 # actix-server = { path="../actix-net/actix-server/" }
 # actix-utils = { path="../actix-net/actix-utils/" }
 
-base64 = "0.9"
+base64 = "0.10"
 backtrace = "0.3"
 bitflags = "1.0"
 bytes = "0.4"
@@ -66,7 +66,7 @@ log = "0.4"
 mime = "0.3"
 net2 = "0.2"
 percent-encoding = "1.0"
-rand = "0.5"
+rand = "0.6"
 serde = "1.0"
 serde_json = "1.0"
 sha1 = "0.6"
@@ -75,14 +75,14 @@ serde_urlencoded = "0.5.3"
 time = "0.1"
 tokio-tcp = "0.1"
 tokio-timer = "0.2"
-trust-dns-resolver = "0.10.1"
+trust-dns-resolver = { version="0.11.0-alpha.1", default-features = false }
 
 # openssl
 openssl = { version="0.10", optional = true }
 
 [dev-dependencies]
 actix-web = "0.7"
-env_logger = "0.5"
+env_logger = "0.6"
 serde_derive = "1.0"
 
 [profile.release]
diff --git a/src/h1/decoder.rs b/src/h1/decoder.rs
index b2c410c47..7c17e909a 100644
--- a/src/h1/decoder.rs
+++ b/src/h1/decoder.rs
@@ -102,7 +102,8 @@ pub(crate) trait MessageType: Sized {
                         }
                         // connection keep-alive state
                         header::CONNECTION => {
-                            ka = if let Ok(conn) = value.to_str().map(|conn| conn.trim()) {
+                            ka = if let Ok(conn) = value.to_str().map(|conn| conn.trim())
+                            {
                                 if conn.eq_ignore_ascii_case("keep-alive") {
                                     Some(ConnectionType::KeepAlive)
                                 } else if conn.eq_ignore_ascii_case("close") {
@@ -925,7 +926,6 @@ mod tests {
         let req = parse_ready!(&mut buf);
 
         assert_eq!(req.inner().head.ctype, Some(ConnectionType::KeepAlive));
-
     }
 
     #[test]
@@ -986,7 +986,6 @@ mod tests {
 
         assert!(req.upgrade());
         assert_eq!(req.inner().head.ctype, Some(ConnectionType::Upgrade));
-
     }
 
     #[test]
diff --git a/src/ws/transport.rs b/src/ws/transport.rs
index f59ad67a7..6a4f4d227 100644
--- a/src/ws/transport.rs
+++ b/src/ws/transport.rs
@@ -7,7 +7,7 @@ use super::{Codec, Frame, Message};
 
 pub struct Transport<S, T>
 where
-    S: Service<Frame, Response = Message>,
+    S: Service<Frame, Response = Message> + 'static,
     T: AsyncRead + AsyncWrite,
 {
     inner: FramedTransport<S, T, Codec>,