HttpServerConnection#Disconnect(): add explicit context switches

refs #7431
Icinga · Aug 28, 2019 · c6c7bdf · c6c7bdf
1 parent 40b9d66
commit c6c7bdf
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
@@ -78,13 +78,19 @@ void HttpServerConnection::Disconnect()
 			Log(LogInformation, "HttpServerConnection")
 				<< "HTTP client disconnected (from " << m_PeerAddress << ")";
 
+			AsioConditionVariable cv (IoEngine::Get().GetIoService());
+
+			cv.Set();
+
 			m_CheckLivenessTimer.cancel();
 
 			try {
 				m_Stream->lowest_layer().cancel();
 			} catch (...) {
 			}
 
+			cv.Wait(yc);
+
 			try {
 				m_Stream->next_layer().async_shutdown(yc);
 			} catch (...) {
@@ -95,6 +101,8 @@ void HttpServerConnection::Disconnect()
 			} catch (...) {
 			}
 
+			cv.Wait(yc);
+
 			auto listener (ApiListener::GetInstance());
 
 			if (listener) {