tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 22:24:44 +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 6cd931726d
commit b6a799d53e
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base/tlsstream.cpp
View File

@ -318,13 +318,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;

6
lib/remote/httpserverconnection.cpp
View File

@ -216,6 +216,12 @@ void HttpServerConnection::DataAvailableHandler(void)
if (close) if (close)
Disconnect(); Disconnect();
return;
}
if (m_Stream->IsEof())
Disconnect();
} }
void HttpServerConnection::CheckLiveness(void) void HttpServerConnection::CheckLiveness(void)

6
lib/remote/jsonrpcconnection.cpp
View File

@ -249,6 +249,12 @@ void JsonRpcConnection::DataAvailableHandler(void)
if (close) if (close)
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)