summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocketframe.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-02-15 21:17:58 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-02-15 21:17:58 +0100
commitac26702bc0aae107706843f78780c0c2451fbacd (patch)
treee79b67020a76735cf054ca3b27c5e15de434185f /src/websockets/qwebsocketframe.cpp
parente821221d4bbeab3715702e4265670f58290676d6 (diff)
parent2d8c94cf11097b61689757f8a0162bb7dd9d7d0b (diff)
downloadqtwebsockets-ac26702bc0aae107706843f78780c0c2451fbacd.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: .qmake.conf Change-Id: I42592e133b25ebd271b387353a868b68825291d5
Diffstat (limited to 'src/websockets/qwebsocketframe.cpp')
-rw-r--r--src/websockets/qwebsocketframe.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/websockets/qwebsocketframe.cpp b/src/websockets/qwebsocketframe.cpp
index 73a0bc5..ebc3c33 100644
--- a/src/websockets/qwebsocketframe.cpp
+++ b/src/websockets/qwebsocketframe.cpp
@@ -528,10 +528,10 @@ bool QWebSocketFrame::checkValidity()
} else if (isControlFrame()) {
if (Q_UNLIKELY(m_length > 125)) {
setError(QWebSocketProtocol::CloseCodeProtocolError,
- tr("Controle frame is larger than 125 bytes"));
+ tr("Control frame is larger than 125 bytes"));
} else if (Q_UNLIKELY(!m_isFinalFrame)) {
setError(QWebSocketProtocol::CloseCodeProtocolError,
- tr("Controle frames cannot be fragmented"));
+ tr("Control frames cannot be fragmented"));
} else {
m_isValid = true;
}