From 6cffd2b86e82580a9170a90fa926eaa8f0205a2f Mon Sep 17 00:00:00 2001 From: badaix Date: Wed, 23 Dec 2015 08:21:39 +0100 Subject: [PATCH] v0.3.4 --- client/Makefile | 2 +- server/Makefile | 2 +- server/controlServer.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/Makefile b/client/Makefile index 3a8fa4a3..a1aad65e 100644 --- a/client/Makefile +++ b/client/Makefile @@ -1,4 +1,4 @@ -VERSION = 0.3.2 +VERSION = 0.3.4 TARGET = snapclient SHELL = /bin/bash diff --git a/server/Makefile b/server/Makefile index 499cf231..41b9f427 100644 --- a/server/Makefile +++ b/server/Makefile @@ -1,4 +1,4 @@ -VERSION = 0.3.2 +VERSION = 0.3.4 TARGET = snapserver SHELL = /bin/bash diff --git a/server/controlServer.cpp b/server/controlServer.cpp index 1d5d7c48..e4cf1c63 100644 --- a/server/controlServer.cpp +++ b/server/controlServer.cpp @@ -141,6 +141,7 @@ void ControlServer::handleAccept(socket_ptr socket) tv.tv_usec = 0; setsockopt(socket->native(), SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); setsockopt(socket->native(), SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); +// socket->set_option(boost::asio::ip::tcp::no_delay(false)); logS(kLogNotice) << "ControlServer::NewConnection: " << socket->remote_endpoint().address().to_string() << endl; shared_ptr session = make_shared(this, socket); {