Fix handshakeReceived not being invoked in some situation

In the rare case where the handshake was received before the signal and
slot was connected it would never invoke handshakeReceived and the
server would keep waiting.

Task-number: QTBUG-64026
Change-Id: I86d54031d2583b6a0cf2b5348889b5ef859b9aab
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

1 files changed, 5 insertions, 0 deletions

diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp
index b7972b0..55e9484 100644
--- a/src/websockets/qwebsocketserver_p.cpp
+++ b/src/websockets/qwebsocketserver_p.cpp
@@ -490,6 +490,11 @@ void QWebSocketServerPrivate::handleConnection(QTcpSocket *pTcpSocket) const
         QObjectPrivate::connect(pTcpSocket, &QTcpSocket::readyRead,
                                 this, &QWebSocketServerPrivate::handshakeReceived,
                                 Qt::QueuedConnection);
+        if (pTcpSocket->canReadLine()) {
+            // We received some data! We must emit now to be sure that handshakeReceived is called
+            // since the data could have been received before the signal and slot was connected.
+            emit pTcpSocket->readyRead();
+        }
         QObjectPrivate::connect(pTcpSocket, &QTcpSocket::disconnected,
                                 this, &QWebSocketServerPrivate::onSocketDisconnected);
     }