diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:08:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:54:49 +0200 |
| commit | 26e56e18eb234df4a782737cd3c8d8d11daead2c (patch) | |
| tree | ab02a7bcbec017b2d5f9e32e6123dd493c60ad50 /src/websockets/qwebsocket_p.cpp | |
| parent | e5133f4f0bb7c01d7bd7fc499d8c148c03a5b500 (diff) | |
| parent | 8bac2e667f56efc552228ed61c4ccbc3e9efa721 (diff) | |
| download | qtwebsockets-26e56e18eb234df4a782737cd3c8d8d11daead2c.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ib89576c203259364795a3b1caf0717fb28126629
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 1a47e76..f36056c 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -953,7 +953,7 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket) case NothingDoneState: m_headers.clear(); m_handshakeState = ReadingStatusState; - // no break + Q_FALLTHROUGH(); case ReadingStatusState: if (!pSocket->canReadLine()) return; @@ -963,7 +963,7 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket) break; } m_handshakeState = ReadingHeaderState; - // no break + Q_FALLTHROUGH(); case ReadingHeaderState: while (pSocket->canReadLine()) { QString headerLine = readLine(pSocket); @@ -985,7 +985,7 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket) } return; } - // no break + Q_FALLTHROUGH(); case ParsingHeaderState: { const QString acceptKey = m_headers.value(QStringLiteral("sec-websocket-accept"), QString()); const QString upgrade = m_headers.value(QStringLiteral("upgrade"), QString()); |