diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 19:44:13 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-18 00:20:27 +0100 |
commit | f09baa9295db1327d99ab98e7ccd4f6296056d1c (patch) | |
tree | 4e15bc61e215055160ac85e820c861301857e412 /src/websockets | |
parent | 16ec78ad597e13eb1dd74ae5c13338e4ef8d4374 (diff) | |
download | qtwebsockets-f09baa9295db1327d99ab98e7ccd4f6296056d1c.tar.gz |
one if (m_mustMask) is enough
Change-Id: I6cb89b981b70f10510319bfb51b77874e2a4d85a
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src/websockets')
-rw-r--r-- | src/websockets/qwebsocket_p.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index e00f209..8c86aba 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -318,16 +318,16 @@ void QWebSocketPrivate::close(QWebSocketProtocol::CloseCode closeCode, QString r return; if (!m_isClosingHandshakeSent) { Q_Q(QWebSocket); - quint32 maskingKey = 0; - if (m_mustMask) - maskingKey = generateMaskingKey(); const quint16 code = qToBigEndian<quint16>(closeCode); QByteArray payload; payload.append(static_cast<const char *>(static_cast<const void *>(&code)), 2); if (!reason.isEmpty()) payload.append(reason.toUtf8()); - if (m_mustMask) + quint32 maskingKey = 0; + if (m_mustMask) { + maskingKey = generateMaskingKey(); QWebSocketProtocol::mask(payload.data(), payload.size(), maskingKey); + } QByteArray frame = getFrameHeader(QWebSocketProtocol::OC_CLOSE, payload.size(), maskingKey, true); frame.append(payload); |