summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2022-10-03 14:00:46 +0300
committerJuha Vuolle <juha.vuolle@insta.fi>2022-10-05 13:08:38 +0300
commit17b96b31585e338afe5f5c71706a12cc3d2cd740 (patch)
treee97b0cb7281ac11e63ec2792ed5c24c731835b61 /src
parentb8d114fc4b48ff1875b18cce4262e2d630c0f738 (diff)
downloadqtwebsockets-17b96b31585e338afe5f5c71706a12cc3d2cd740.tar.gz
Fix uninitialized QWebSocket::errorString()
Amends: bbd9f2f4f5e0fda85029fa320f793973ea607c2b Fixes: QTBUG-106937 Pick-to: 6.3 6.4 Change-Id: Ia805df3e3dd8ba61e53592ebfb0a8bfae9184042 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/websockets/qwebsocket_p.cpp2
-rw-r--r--src/websockets/qwebsocket_p.h5
2 files changed, 1 insertions, 6 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index b806229..c13d831 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1058,7 +1058,7 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
} else {
errorDescription =
QWebSocket::tr("QWebSocketPrivate::processHandshake: Unhandled http status code: %1 (%2).")
- .arg(m_httpStatusCode).arg(m_httpStatusMessage);
+ .arg(parser.getStatusCode()).arg(parser.getReasonPhrase());
}
if (ok) {
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index 48f7fb3..f30dfff 100644
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -221,11 +221,6 @@ private:
QDefaultMaskGenerator m_defaultMaskGenerator;
QByteArray m_statusLine;
- int m_httpStatusCode;
- int m_httpMajorVersion, m_httpMinorVersion;
- QString m_httpStatusMessage;
- QMultiMap<QString, QString> m_headers;
-
quint64 m_outgoingFrameSize;
friend class QWebSocketServerPrivate;