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

Fix deadlock in HttpClientConnection::DataAvailableHandler

Browse Source 
refs #11014
This commit is contained in:
Gunnar Beutner 2016-02-01 14:50:18 +01:00
parent e6a972f975
commit ec050dd2a7
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/remote/httpclientconnection.cpp
View File

@ -137,24 +137,28 @@ bool HttpClientConnection::ProcessMessage(void)
void HttpClientConnection::DataAvailableHandler(const Stream::Ptr& stream) void HttpClientConnection::DataAvailableHandler(const Stream::Ptr& stream)
{ {
boost::mutex::scoped_lock lock(m_DataHandlerMutex);
ASSERT(stream == m_Stream); ASSERT(stream == m_Stream);
try { bool close = false;
while (ProcessMessage())
; /* empty loop body */
} catch (const std::exception& ex) {
Log(LogWarning, "HttpClientConnection")
<< "Error while reading Http response: " << DiagnosticInformation(ex);
Disconnect(); if (!m_Stream->IsEof()) {
} boost::mutex::scoped_lock lock(m_DataHandlerMutex);
if (m_Context.Eof) { try {
Log(LogWarning, "HttpClientConnection", "Encountered unexpected EOF while reading Http response."); while (ProcessMessage())
; /* empty loop body */
} catch (const std::exception& ex) {
Log(LogWarning, "HttpClientConnection")
<< "Error while reading Http response: " << DiagnosticInformation(ex);
close = true;
Disconnect();
}
} else
close = true;
if (close)
m_Stream->Close(); m_Stream->Close();
}
} }
boost::shared_ptr<HttpRequest> HttpClientConnection::NewRequest(void) boost::shared_ptr<HttpRequest> HttpClientConnection::NewRequest(void)