commit 21a866749828aa2354234e4c5d3d1cc8ef2b9a80
author Cliff Jansen <cliffjansen@apache.org> Thu May 20 07:34:11 2021 -0700
committer Cliff Jansen <cliffjansen@apache.org> Thu May 20 07:34:11 2021 -0700
tree 3c51da08b491bdfdc86f5bd0671a94ced3ce2db8
parent d0bf9e36f31b2e753c2ac855dddc6de4024b40f6

QPID-8527: Fix hang in qpidd with TLS connections.

src/qpid/sys/posix/AsynchIO.cpp

diff --git a/src/qpid/sys/posix/AsynchIO.cpp b/src/qpid/sys/posix/AsynchIO.cpp
index a05e66f..9b842f3 100644
--- a/src/qpid/sys/posix/AsynchIO.cpp
+++ b/src/qpid/sys/posix/AsynchIO.cpp
@@ -27,6 +27,7 @@
 #include "qpid/sys/Probes.h"
 #include "qpid/sys/DispatchHandle.h"
 #include "qpid/sys/Time.h"
+#include "qpid/sys/ssl/SslSocket.h"
 #include "qpid/log/Statement.h"
 
 // TODO The basic algorithm here is not really POSIX specific and with a
@@ -461,6 +462,12 @@
                 // Stop reading if we've overrun our timeslot
                 if ( duration > threadMaxIoTimeNs) {
                     QPID_PROBE4(asynchio_read_finished_maxtime, &h, duration, total, readCalls);
+                    // epoll cannot see into an SslSocket's buffered input and may hang.
+                    const qpid::sys::ssl::SslSocket *s = dynamic_cast<const qpid::sys::ssl::SslSocket *>(&socket);
+                    if (s) {
+                        // Schedule a future readble callback.  QPID-8527
+                        call(boost::bind(&AsynchIO::readable, this, _1));
+                    }
                     break;
                 }