From 7f4af89a56d29812efbe3580799259108dc87484 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Wed, 13 Jan 2016 10:30:38 +0100
Subject: [PATCH] Ensure that HttpServerConnections are properly closed

fixes #10655
---
 lib/base/tlsstream.cpp              | 12 +++++-------
 lib/remote/httpserverconnection.cpp |  5 +++++
 lib/remote/jsonrpcconnection.cpp    |  5 +++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp
index e4b69aeb3..55d97eb1e 100644
--- a/lib/base/tlsstream.cpp
+++ b/lib/base/tlsstream.cpp
@@ -218,9 +218,6 @@ void TlsStream::OnEvent(int revents)
 		case SSL_ERROR_ZERO_RETURN:
 			lock.unlock();
 
-			if (IsHandlingEvents())
-				SignalDataAvailable();
-
 			Close();
 
 			break;
@@ -237,9 +234,6 @@ void TlsStream::OnEvent(int revents)
 
 			lock.unlock();
 
-			if (IsHandlingEvents())
-				SignalDataAvailable();
-
 			Close();
 
 			break;
@@ -316,13 +310,17 @@ void TlsStream::Shutdown(void)
  */
 void TlsStream::Close(void)
 {
+	if (!m_Eof) {
+		m_Eof = true;
+		SignalDataAvailable();
+	}
+
 	Stream::Close();
 
 	SocketEvents::Unregister();
 
 	boost::mutex::scoped_lock lock(m_Mutex);
 
-	m_Eof = true;
 
 	if (!m_SSL)
 		return;
diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index 2a857aee9..3b533ca8b 100644
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -206,7 +206,12 @@ void HttpServerConnection::DataAvailableHandler(void)
 		    << "Error while reading Http request: " << DiagnosticInformation(ex);
 
 		Disconnect();
+
+		return;
 	}
+
+	if (m_Stream->IsEof())
+		Disconnect();
 }
 
 void HttpServerConnection::CheckLiveness(void)
diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp
index 0a095c9fd..ae514dfab 100644
--- a/lib/remote/jsonrpcconnection.cpp
+++ b/lib/remote/jsonrpcconnection.cpp
@@ -202,7 +202,12 @@ void JsonRpcConnection::DataAvailableHandler(void)
 		    << "': " << DiagnosticInformation(ex);
 
 		Disconnect();
+
+		return;
 	}
+
+	if (m_Stream->IsEof())
+		Disconnect();
 }
 
 Value SetLogPositionHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)