QSslServer: Make sure maxPendingConnections applies to all sockets

Not just the ones we added to the pending sockets list

Pick-to: 6.4
Change-Id: I0a0016fe39df7ca2fc3f0c4e4111195bc6d90198
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

2 files changed, 7 insertions, 0 deletions

diff --git a/src/network/ssl/qsslserver.cpp b/src/network/ssl/qsslserver.cpp
index 2ec42bf3ce..f96fccce82 100644
--- a/src/network/ssl/qsslserver.cpp
+++ b/src/network/ssl/qsslserver.cpp
@@ -350,6 +350,12 @@ void QSslServerPrivate::removeSocketData(quintptr socket)
     }
 }
 
+int QSslServerPrivate::totalPendingConnections() const
+{
+    // max pending connections is int, so this cannot exceed that
+    return QTcpServerPrivate::totalPendingConnections() + int(socketData.size());
+}
+
 void QSslServerPrivate::checkClientHelloAndContinue()
 {
     Q_Q(QSslServer);
diff --git a/src/network/ssl/qsslserver_p.h b/src/network/ssl/qsslserver_p.h
index 71359f6cff..1b90d35d48 100644
--- a/src/network/ssl/qsslserver_p.h
+++ b/src/network/ssl/qsslserver_p.h
@@ -38,6 +38,7 @@ public:
     void initializeHandshakeProcess(QSslSocket *socket);
     void removeSocketData(quintptr socket);
     void handleHandshakeTimedOut(QSslSocket *socket);
+    int totalPendingConnections() const override;
 
     struct SocketData {
         QMetaObject::Connection readyReadConnection;