diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2022-08-16 15:51:10 +0200 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2022-08-18 16:22:55 +0200 |
commit | 906396185b472c3690d541d98c5555879e5835ca (patch) | |
tree | 56c909df2018426ce15c3fd5ec856e4506ce04bd /src | |
parent | 2a276e0dbf8a83967dd9b313fa67ba54bdbb364b (diff) |
QSslServer: Make sure maxPendingConnections applies to all sockets
Not just the ones we added to the pending sockets list
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>
(cherry picked from commit 1ee75e47401d0ed4646d4fef7ce8e09eb90f4d5e)
Diffstat (limited to 'src')
-rw-r--r-- | src/network/socket/qtcpserver.cpp | 16 | ||||
-rw-r--r-- | src/network/socket/qtcpserver_p.h | 1 | ||||
-rw-r--r-- | src/network/ssl/qsslserver.cpp | 6 | ||||
-rw-r--r-- | src/network/ssl/qsslserver_p.h | 1 |
4 files changed, 23 insertions, 1 deletions
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp index 95d1877a5d..e6ff34cee9 100644 --- a/src/network/socket/qtcpserver.cpp +++ b/src/network/socket/qtcpserver.cpp @@ -172,7 +172,7 @@ void QTcpServerPrivate::readNotification() { Q_Q(QTcpServer); for (;;) { - if (pendingConnections.count() >= maxConnections) { + if (totalPendingConnections() >= maxConnections) { #if defined (QTCPSERVER_DEBUG) qDebug("QTcpServerPrivate::_q_processIncomingConnection() too many connections"); #endif @@ -206,6 +206,20 @@ void QTcpServerPrivate::readNotification() } /*! + \internal + Return the amount of sockets currently in queue for the server. + This is to make maxPendingConnections work properly with servers that don't + necessarily have 'ready-to-go' sockets as soon as they connect, + e.g. QSslServer. + By default we just return pendingConnections.size(), which is equivalent to + what it did before. +*/ +int QTcpServerPrivate::totalPendingConnections() const +{ + return int(pendingConnections.size()); +} + +/*! Constructs a QTcpServer object. \a parent is passed to the QObject constructor. diff --git a/src/network/socket/qtcpserver_p.h b/src/network/socket/qtcpserver_p.h index a526549538..853a4aaf96 100644 --- a/src/network/socket/qtcpserver_p.h +++ b/src/network/socket/qtcpserver_p.h @@ -56,6 +56,7 @@ public: #endif virtual void configureCreatedSocket(); + virtual int totalPendingConnections() const; // from QAbstractSocketEngineReceiver void readNotification() override; 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; |