tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-29 16:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that HttpServerConnections are properly closed

Browse Source 
fixes #10655
This commit is contained in:
Gunnar Beutner 2016-01-13 10:30:38 +01:00
parent 882495952a
commit 7f4af89a56
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/base/tlsstream.cpp
View File

@ -218,9 +218,6 @@ void TlsStream::OnEvent(int revents)
case SSL_ERROR_ZERO_RETURN: case SSL_ERROR_ZERO_RETURN:
lock.unlock(); lock.unlock();
if (IsHandlingEvents())
SignalDataAvailable();
Close(); Close();
break; break;
@ -237,9 +234,6 @@ void TlsStream::OnEvent(int revents)
lock.unlock(); lock.unlock();
if (IsHandlingEvents())
SignalDataAvailable();
Close(); Close();
break; break;
@ -316,13 +310,17 @@ void TlsStream::Shutdown(void)
*/ */
void TlsStream::Close(void) void TlsStream::Close(void)
{ {
if (!m_Eof) {
m_Eof = true;
SignalDataAvailable();
}
Stream::Close(); Stream::Close();
SocketEvents::Unregister(); SocketEvents::Unregister();
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
m_Eof = true;
if (!m_SSL) if (!m_SSL)
return; return;

5
lib/remote/httpserverconnection.cpp
View File

@ -206,7 +206,12 @@ void HttpServerConnection::DataAvailableHandler(void)
<< "Error while reading Http request: " << DiagnosticInformation(ex); << "Error while reading Http request: " << DiagnosticInformation(ex);
Disconnect(); Disconnect();
return;
} }
if (m_Stream->IsEof())
Disconnect();
} }
void HttpServerConnection::CheckLiveness(void) void HttpServerConnection::CheckLiveness(void)

5
lib/remote/jsonrpcconnection.cpp
View File

@ -202,7 +202,12 @@ void JsonRpcConnection::DataAvailableHandler(void)
<< "': " << DiagnosticInformation(ex); << "': " << DiagnosticInformation(ex);
Disconnect(); Disconnect();
return;
} }
if (m_Stream->IsEof())
Disconnect();
} }
Value SetLogPositionHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params) Value SetLogPositionHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)