2 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 6e3781dca..359234044 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -75,6 +75,8 @@ Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code cons
 		return;
 	}
 
+	_socket = socket;
+
 	handle (socket);
 	start_accept ();
 }
@@ -89,5 +91,8 @@ Server::stop ()
 	}
 
 	_acceptor.close ();
+	if (auto s = _socket.lock()) {
+		s->close();
+	}
 	_io_service.stop ();
 }
diff --git a/src/lib/server.h b/src/lib/server.h
index 0b1950aa7..7e42f6cbd 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -57,6 +57,7 @@ private:
 	boost::asio::io_service _io_service;
 	boost::asio::ip::tcp::acceptor _acceptor;
 	int _timeout;
+	std::weak_ptr<Socket> _socket;
 };