diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2022-10-03 15:27:34 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-06 05:10:02 +0000 |
commit | 3b4c00965fcdd63eb0acc143817820d1f5dc55d2 (patch) | |
tree | 6309b946c278c064870a2d80fab64b62a732d1b8 | |
parent | 1d8fed1d61ca36de9bd4ebd2b9ce1dcabafa815e (diff) | |
download | qtwebsockets-3b4c00965fcdd63eb0acc143817820d1f5dc55d2.tar.gz |
Remove/replace uninitialized status line variable in error string
Amends: bbd9f2f4f5e0fda85029fa320f793973ea607c2b
Change-Id: I4af7b167e5f45ad5ead25f6421a2af8638494fd4
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 99ebe2f669258b3919a0933ffd5d4c85fb13c0c0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/websockets/qwebsocket_p.cpp | 7 | ||||
-rw-r--r-- | src/websockets/qwebsocket_p.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 15217ce..380436c 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -1034,9 +1034,12 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket) .arg(acceptKey, accept); } } else { + const QString upgradeParms = QLatin1String( + "Accept-key size: %1, version: %2.%3, upgrade: %4, connection: %5").arg( + QString::number(acceptKey.size()), QString::number(parser.getMajorVersion()), + QString::number(parser.getMinorVersion()), upgrade, connection); errorDescription = QWebSocket::tr( - "QWebSocketPrivate::processHandshake: Invalid status line in response: %1.") - .arg(QString::fromLatin1(m_statusLine)); + "Invalid parameter(s) presented during protocol upgrade: %1").arg(upgradeParms); } } else if (parser.getStatusCode() == 400) { //HTTP/1.1 400 Bad Request diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index 167535c..cddb6b3 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -219,7 +219,6 @@ private: QMaskGenerator *m_pMaskGenerator; QDefaultMaskGenerator m_defaultMaskGenerator; - QByteArray m_statusLine; quint64 m_outgoingFrameSize; friend class QWebSocketServerPrivate; |