diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:31 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:31 +0100 |
commit | a99beb2c7b5867aac0e5ae997042cc88c0f6a175 (patch) | |
tree | 8d2022a94099c17be4a5ff3fd429731a260190a2 /src/websockets/qwebsocketserver_p.cpp | |
parent | cd26439ac7ca1a444e9b5534a504afb0bb411890 (diff) | |
parent | 203da360c4bcd64bdd17639d495f1857b622e92d (diff) | |
download | qtwebsockets-a99beb2c7b5867aac0e5ae997042cc88c0f6a175.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3ae5df71f201cfdb9a4c9e7d90a60d1f9792700a
Diffstat (limited to 'src/websockets/qwebsocketserver_p.cpp')
-rw-r--r-- | src/websockets/qwebsocketserver_p.cpp | 5 |
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); } |