diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-08-27 07:51:43 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-08-27 07:51:43 +0300 |
| commit | ceeb9952b29345b662669a6a0a5c4dadf49db114 (patch) | |
| tree | b9572f228c24304380b9f7b2f815a7b330e7f051 /src/websockets/qwebsocket_p.cpp | |
| parent | 6e1fa958c289de639753a60a9384bd94db0e91a8 (diff) | |
| parent | a302c6108d79b02a339b4ca93d2fce0b58386d51 (diff) | |
| download | qtwebsockets-ceeb9952b29345b662669a6a0a5c4dadf49db114.tar.gz | |
Merge dev into 5.14
Change-Id: I2eaffbe6e9519a78d0f8663c0870f24cb006d222
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 192019d..0334b8a 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -1175,10 +1175,10 @@ void QWebSocketPrivate::processData() { if (!m_pSocket) // disconnected with data still in-bound return; - while (m_pSocket->bytesAvailable()) { + if (m_pSocket->bytesAvailable()) { if (state() == QAbstractSocket::ConnectingState) { if (!m_pSocket->canReadLine()) - break; + return; processHandshake(m_pSocket); } else { m_dataProcessor.process(m_pSocket); |