diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:13:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:13:49 +0200 |
| commit | 38d830d00fc2f8c196d736094448e55623e4b35e (patch) | |
| tree | b0d11df1e0d5adfaf3f8e0bf64ff09c887c0a339 /src/websockets/qwebsocket_p.cpp | |
| parent | a6d4f7e2fce89807e3e92fd945d99722ce893b2b (diff) | |
| parent | e66dcd51d0e5517e88cd59912fd08501522a2902 (diff) | |
| download | qtwebsockets-38d830d00fc2f8c196d736094448e55623e4b35e.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ie37e1ec038e82c845066f92e5f87e355d627e2ff
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 8cd7375..be8cb88 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -981,7 +981,7 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket) } if (m_handshakeState != ParsingHeaderState) { - if (pSocket->atEnd()) { + if (pSocket->state() != QAbstractSocket::ConnectedState) { errorDescription = QWebSocket::tr("QWebSocketPrivate::processHandshake: Connection closed while reading header."); break; } |