From 7554e8839ac230b08a0b670c31a4843ba1f17cb1 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sun, 23 Feb 2020 15:57:28 +0100 Subject: Doc: fix links to autobahn testsuite Fixes: QTBUG-69425 Change-Id: I28e03da927c7a9b1cbfb91a0aca32866c2e653ea Reviewed-by: Christian Ehrlicher --- src/websockets/doc/src/external-resources.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/websockets/doc/src/external-resources.qdoc b/src/websockets/doc/src/external-resources.qdoc index 40e4257..da4c5f4 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 */ -- cgit v1.2.1 From 9d3eb184c72333a95ee8f9ee33bd51942271de64 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sun, 23 Feb 2020 15:56:59 +0100 Subject: Doc: fix missing closing comment Change-Id: I2e1f4893b1b4c1270630101c390b937611e5d5e2 Reviewed-by: Paul Wicking --- src/websockets/doc/src/external-resources.qdoc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/websockets/doc/src/external-resources.qdoc b/src/websockets/doc/src/external-resources.qdoc index da4c5f4..ce39b9b 100644 --- a/src/websockets/doc/src/external-resources.qdoc +++ b/src/websockets/doc/src/external-resources.qdoc @@ -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' -- cgit v1.2.1 From a246fb2ae2a810b62147cf64d96410a26b93e637 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 25 Feb 2020 11:59:57 +0200 Subject: Update plugins.qmltypes for 5.15 Task-number: QTBUG-82253 Change-Id: I90199c05f683df18dffe796227fc8e4c0ef9f72d Reviewed-by: Kai Koehne --- src/imports/qmlwebsockets/plugins.qmltypes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: [] -- cgit v1.2.1 From a844995bb8b48c08c5f6180b727c8f45bd23dfa5 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sun, 23 Feb 2020 17:00:44 +0100 Subject: WebSocketServer: Add Q_(UN)LIKELY MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... to optimize code that is used for error handling. Change-Id: I62fe11d34d32c6784e960505fccbf529a3265d23 Reviewed-by: Christian Ehrlicher Reviewed-by: Mårten Nordheim --- src/websockets/qwebsocketserver_p.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp index 8c75721..3196ca7 100644 --- a/src/websockets/qwebsocketserver_p.cpp +++ b/src/websockets/qwebsocketserver_p.cpp @@ -439,7 +439,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.")); @@ -453,7 +453,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.")); @@ -465,7 +465,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.")); @@ -487,16 +487,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(); -- cgit v1.2.1 From 87c9513aed424f0c97a78271f59a34873cc7e522 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 27 Feb 2020 09:51:39 +0000 Subject: Revert "QWebSocket - do not use deprecated member-function" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 938ad6373415fa8b0767a987c37ce51ec546859f. Reason for revert: Was undeprecated and replacement removed Change-Id: I79d6e931d72ec518a43fe058e1067b3754f6cf05 Reviewed-by: Mårten Nordheim --- src/websockets/qwebsocket_p.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 1493e15..56c4cdd 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; } -- cgit v1.2.1