From 37d28304c9c01296424f3bfce640ad390d9c3afe Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Fri, 21 Dec 2018 10:38:08 -0800
Subject: [PATCH] Fix max concurrent connections handling

---
 actix-server/CHANGES.md      | 7 +++++++
 actix-server/Cargo.toml      | 2 +-
 actix-server/src/services.rs | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md
index b42dc1a5..75227b73 100644
--- a/actix-server/CHANGES.md
+++ b/actix-server/CHANGES.md
@@ -1,5 +1,12 @@
 # Changes
 
+## [0.1.3] - 2018-12-21
+
+## Fixed
+
+* Fix max concurrent connections handling
+
+
 ## [0.1.2] - 2018-12-12
 
 ## Changed
diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml
index dc5eb3d6..bbfb7dc4 100644
--- a/actix-server/Cargo.toml
+++ b/actix-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-server"
-version = "0.1.2"
+version = "0.1.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix server - General purpose tcp server"
 keywords = ["network", "framework", "async", "futures"]
diff --git a/actix-server/src/services.rs b/actix-server/src/services.rs
index 30261187..27c6fd8e 100644
--- a/actix-server/src/services.rs
+++ b/actix-server/src/services.rs
@@ -83,9 +83,9 @@ where
                 });
 
                 if let Ok(stream) = stream {
-                    spawn(self.service.call(stream).map_err(|_| ()).map(move |val| {
+                    spawn(self.service.call(stream).then(move |res| {
                         drop(guard);
-                        val
+                        res.map_err(|_| ())
                     }));
                     ok(())
                 } else {
@@ -122,9 +122,9 @@ where
     }
 
     fn call(&mut self, (guard, req): (Option<CounterGuard>, ServerMessage)) -> Self::Future {
-        spawn(self.service.call(req).map_err(|_| ()).map(move |val| {
+        spawn(self.service.call(req).then(move |res| {
             drop(guard);
-            val
+            res.map_err(|_| ())
         }));
         ok(())
     }