Improve error handling for TlsStream::Handshake

fixes #11046

diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp
index 93a7501a5f176047d7a8ed0c0facb25471e016af..c4074eaa0d32c1e8c48e4ddca7ebd9ce98b1e8da 100644 (file)
--- a/lib/base/tlsstream.cpp
+++ b/lib/base/tlsstream.cpp
@@ -268,9 +268,12 @@ void TlsStream::Handshake(void)
        m_CurrentAction = TlsActionHandshake;
        ChangeEvents(POLLOUT);
 
-       while (!m_HandshakeOK && !m_ErrorOccurred)
+       while (!m_HandshakeOK && !m_ErrorOccurred && !m_Eof)
                m_CV.wait(lock);
 
+       if (m_Eof)
+               BOOST_THROW_EXCEPTION(std::runtime_error("Socket was closed during TLS handshake."));
+
        HandleError();
 }