summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-29 03:06:02 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-29 03:06:03 +0100
commit69874130efc7f87147a3317d6ce7a17e6f0a466b (patch)
tree38725fa14c4d789a01908f5fd3de7a53e23ebca6
parentfccb43f3ee253cad1aa2b433a9b91fa1a30c7871 (diff)
parent87c9513aed424f0c97a78271f59a34873cc7e522 (diff)
downloadqtwebsockets-69874130efc7f87147a3317d6ce7a17e6f0a466b.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib6762714c19354c7adbf0c032d2f9995f576114f
-rw-r--r--src/imports/qmlwebsockets/plugins.qmltypes2
-rw-r--r--src/websockets/doc/src/external-resources.qdoc5
-rw-r--r--src/websockets/qwebsocket_p.cpp2
-rw-r--r--src/websockets/qwebsocketserver_p.cpp12
4 files changed, 11 insertions, 10 deletions
diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes
index f1a5a2e..cabe5a2 100644
--- a/src/imports/qmlwebsockets/plugins.qmltypes
+++ b/src/imports/qmlwebsockets/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.14'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.15'
Module {
dependencies: []
diff --git a/src/websockets/doc/src/external-resources.qdoc b/src/websockets/doc/src/external-resources.qdoc
index 40e4257..ce39b9b 100644
--- a/src/websockets/doc/src/external-resources.qdoc
+++ b/src/websockets/doc/src/external-resources.qdoc
@@ -86,12 +86,12 @@
*/
/*!
- \externalpage http://autobahn.ws/testsuite/
+ \externalpage https://github.com/crossbario/autobahn-testsuite
\title Autobahn|Testsuite
*/
/*!
- \externalpage http://autobahn.ws/testsuite/installation.html
+ \externalpage https://github.com/crossbario/autobahn-testsuite/blob/master/README.md#installation
\title Autobahn|Testsuite installation documentation
*/
@@ -103,6 +103,7 @@
/*!
\externalpage https://bugzilla.mozilla.org/show_bug.cgi?id=594502
\title Firefox bug 594502
+*/
/*
This prevents autolinking of each occurrence of 'WebSocket'
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 14895b7..cd0b918 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -198,7 +198,7 @@ QAbstractSocket::SocketError QWebSocketPrivate::error() const
{
QAbstractSocket::SocketError err = QAbstractSocket::UnknownSocketError;
if (Q_LIKELY(m_pSocket))
- err = m_pSocket->socketError();
+ err = m_pSocket->error();
return err;
}
diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp
index d139f4b..f922098 100644
--- a/src/websockets/qwebsocketserver_p.cpp
+++ b/src/websockets/qwebsocketserver_p.cpp
@@ -445,7 +445,7 @@ void QWebSocketServerPrivate::handshakeReceived()
//then we don't have our header complete yet
//check that no one is trying to exhaust our virtual memory
const qint64 maxHeaderLength = MAX_HEADERLINE_LENGTH * MAX_HEADERLINES + endOfHeaderMarker.size();
- if (byteAvailable > maxHeaderLength) {
+ if (Q_UNLIKELY(byteAvailable > maxHeaderLength)) {
pTcpSocket->close();
setError(QWebSocketProtocol::CloseCodeTooMuchData,
QWebSocketServer::tr("Header is too large."));
@@ -459,7 +459,7 @@ void QWebSocketServerPrivate::handshakeReceived()
bool success = false;
bool isSecure = (m_secureMode == SecureMode);
- if (m_pendingConnections.length() >= maxPendingConnections()) {
+ if (Q_UNLIKELY(m_pendingConnections.length() >= maxPendingConnections())) {
pTcpSocket->close();
setError(QWebSocketProtocol::CloseCodeAbnormalDisconnection,
QWebSocketServer::tr("Too many pending connections."));
@@ -471,7 +471,7 @@ void QWebSocketServerPrivate::handshakeReceived()
//remove our header from the tcpSocket
qint64 skippedSize = pTcpSocket->skip(headerSize);
- if (skippedSize != headerSize) {
+ if (Q_UNLIKELY(skippedSize != headerSize)) {
pTcpSocket->close();
setError(QWebSocketProtocol::CloseCodeProtocolError,
QWebSocketServer::tr("Read handshake request header failed."));
@@ -493,16 +493,16 @@ void QWebSocketServerPrivate::handshakeReceived()
supportedProtocols(),
supportedExtensions());
- if (response.isValid()) {
+ if (Q_LIKELY(response.isValid())) {
QTextStream httpStream(pTcpSocket);
httpStream << response;
httpStream.flush();
- if (response.canUpgrade()) {
+ if (Q_LIKELY(response.canUpgrade())) {
QWebSocket *pWebSocket = QWebSocketPrivate::upgradeFrom(pTcpSocket,
request,
response);
- if (pWebSocket) {
+ if (Q_LIKELY(pWebSocket)) {
finishHandshakeTimeout(pTcpSocket);
addPendingConnection(pWebSocket);
Q_EMIT q->newConnection();