summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Android: ignore some tst_qwebsockerserver unit testsAssam Boudjelthia2022-04-211-0/+5
| | | | | | | | | | | | | | Ignore those tests to allow enalbing CI tests and fix them one by one after that. These couple cases fail mainly because they don't have the openssl libs bundled with the apk, that is expected to be handled under QTBUG-89053. Task-number: QTBUG-102713 Pick-to: 6.2 6.3 Change-Id: I5cb3d9f62f6943d1477c99456cd650b69ab8c86d Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-04-191-2/+2
| | | | | Change-Id: I00d40c152f4dadb1959bb2282117b17e5895baaa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Mark QWebSocketHandshakeOptions() move-constructor as noexceptEdward Welbourne2022-04-052-2/+2
| | | | | | | | CodeChecker says it should be so marked. Apparently this is good for performance. Change-Id: I93fc95fd61ae37fe7a8927f9fbfb593acabb74ca Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-04-011-2/+2
| | | | | Change-Id: If9b884e6438d6b8d2b748561990f60db13843d4b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix handshake looping infinitely making no progressMårten Nordheim2022-04-012-6/+65
| | | | | | | | | | | | | | | | | | | The processHandshake function may make no progress and return. The loop calling processHandshake previously had no way of knowing this and would happily loop forever despite the outcome being the same every time. This was particularly noticeable with any response that doesn't include the \r\n\r\n sequence the first time we call processHandshake. Since processHandshake either fails or succeeds, not performing any partial-reads, we simply move it out of the loop and restructure some of the code around it. Pick-to: 6.3 6.3.0 Fixes: QTBUG-102111 Change-Id: I3955e4b90eb1be0a0ef5dfcf8a46921a086a8b49 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Revert "Blacklist: test cases blacklisted in tst_QWebSocketServer:"Pasi Petäjäjärvi2022-04-011-4/+0
| | | | | | | | | | This reverts commit 1d0767f546db7db839029d1f51196dc0f60390ae. Reason for revert: Cannot reproduce Task-number: QTBUG-101333 Change-Id: Ib926359f4e23f926d8694f5c63460e978c3a5237 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-03-311-2/+2
| | | | | Change-Id: I007ec6420e37b698cde609f439ea081130944ea8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* tst_QWebSocket: fix scope of ifdef proxy-checkMårten Nordheim2022-03-311-2/+1
| | | | | | | | | Because other tests had made their way inside Pick-to: 6.3 6.2 Change-Id: Ie6fa545a84c2f66e0c2617f498118a3e04eedd0c Reviewed-by: Arno Rehn <a.rehn@menlosystems.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Add support for WebSocket Sub-ProtocolsArno Rehn2022-03-3022-44/+732
| | | | | | | | | | | | | | | | | Sub-Protocol support follows RFC 6455 Sections 4.1 and 4.2. See also https://datatracker.ietf.org/doc/html/rfc6455. This patch introduces a new class QWebSocketHandshakeOptions which collects options for the WebSocket handshake. At the moment, this contains only accessors for sub-protocols. In the future, it can be extended with things like WebSocket extensions. [ChangeLog] Add support for WebSocket Sub-Protocols Fixes: QTBUG-38742 Change-Id: Ibdcef17f717f0a76caab54f65c550865df1ec78d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-03-301-2/+2
| | | | | Change-Id: I651de9cda202adb273bf50c5c9e3fc13303cff01 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Revise Qt WebSockets module landing pageAndreas Eliasson2022-03-281-33/+33
| | | | | | | | | | Remove the include directive section and add the global CMake and qmake snippets. Also, reorganize some of the sections structure. Task-number: QTBUG-100369 Pick-to: 6.3 6.3.0 Change-Id: Ief7a5f845df5b2edaa17c3c652895a4adb7ad3a5 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-03-241-2/+2
| | | | | Change-Id: I83abb21867d3d552fe8a6ca0312459c58800c5e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove .prev_CMakeLists.txtKai Köhne2022-03-224-59/+0
| | | | | | Pick-to: 6.3 Change-Id: Icaf0fac81f51432c706a948d0986aae68e44fffb Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-03-211-2/+2
| | | | | Change-Id: I7761aa714ecaf183a98d148ba24d14763d72b70e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make sure all private headers include at least one otherThiago Macieira2022-03-085-2/+5
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-03-081-2/+2
| | | | | Change-Id: I881bca515c695cb405dd2879b4b7c77801f42f13 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-03-051-2/+2
| | | | | Change-Id: I0c07e899a488236f9248202345f33c74aaa959bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Blacklist: test cases blacklisted in tst_QWebSocketServer:CI Insignificant Platforms Monitor Bot2022-02-281-0/+4
| | | | | | | | | | - tst_handleConnection on qnx Pick-to: 6.2 Pick-to: 6.3 Task-number: QTBUG-101333 Change-Id: If81ec4cb7099063d9b000221aca521579979653c Reviewed-by: CI Insignificant Platforms Monitor Bot <ci_insignificant_platforms_monitor_bot@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-02-281-1/+1
| | | | | Change-Id: I0f7e61918fd451e1bc39363fb5ef2eb1eb2479f1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-02-251-2/+2
| | | | | Change-Id: I6385afc64be8b84abe3caa4a0edd2f8dc3f8da38 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Improve examples CMakeLists.txtKai Köhne2022-02-199-70/+28
| | | | | | | | | | | | | | | | | - Remove "# generated from xyz.pro" comment from pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: I03507e56c961cfd6ae138473437dfafe478d3233 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-02-161-2/+2
| | | | | Change-Id: I8fd8765527cb5a531a0fda6b637b643ca66a4241 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-02-121-2/+2
| | | | | Change-Id: I0978c72cb2232a69c5b29c04edd416a68b2c92d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-02-051-2/+2
| | | | | Change-Id: If39613107ce300aa64570f59180f56a5eb80d9af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Switch examples to build as isolated sub-builds part 2Alexandru Croitor2022-02-051-1/+1
| | | | | | | | | | | | | | | qt_examples_build_begin needs the EXTERNAL_BUILD flag to know that it's safe to build examples as ExternalProjects. It still won't do it in CI until we enable building examples as ExternalProjects for prefix builds. This is preparation for that. Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: I20c9ce497ef32295bab9876caa5ea12dcc68896d Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* tst_QWebsocketServer: Update TLS backend check to be runtimeMårten Nordheim2022-02-021-10/+4
| | | | | | | | | | Because we use plugins now, the #ifdef compile-time checking is not reliable Pick-to: 6.3 6.2 Change-Id: I94dab4250179ae8f15fd5154c6ccb9918329be2a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Fix order of signals around disconnectionJoni Poikelin2022-02-011-3/+1
| | | | | | | | | | | | | | | | readyRead() signal had been connected with QueuedConnection which caused disconnected() signal to sometimes come before last message signals of a connection. Reasoning for this was some issue regarding SSL sockets, but there is a good chance it has been fixed since then. Removing this doesn't seem to cause hangs now at least. Fixes: QTBUG-100054 Pick-to: 6.3 6.2 Change-Id: Id465916d111a5520f4039cf57f822918f3afbca0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-02-011-2/+2
| | | | | Change-Id: I4857ad52c51070cdc470080be525f17ee6be827a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.0Jani Heikkinen2022-02-011-1/+1
| | | | | Change-Id: Id53808bb9bcbb040aac5fdd8b73f4a358ac06498 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-01-251-2/+2
| | | | | Change-Id: I977faa8bd41522a17dfece30eba28d7d3b614087 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Style fix: dedent closing doc tagsArno Rehn2022-01-242-17/+17
| | | | | Change-Id: Id590e49c6d80f562d29e26404285f177bd0ee840 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-01-231-2/+2
| | | | | Change-Id: I26dd8575242eea0b0615d69a7941d053e47c81bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove unused .qrc fileJoerg Bornemann2022-01-201-6/+0
| | | | | | | Task-number: QTBUG-94446 Change-Id: I78cdaf40046bd20b37d3ec7fd85ff0e94756a229 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-01-171-2/+2
| | | | | Change-Id: I67acd33996784d4bb352add2f394e80db8a20b09 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-01-131-2/+2
| | | | | Change-Id: Idee2bfe94552f886e5032c27588d57adebcb254e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix setting of socket optionsJoni Poikelin2022-01-121-4/+8
| | | | | | | | Socket options need to be set after connectToHost() to take any effect. Change-Id: I006a8c59ba1c78d5edaa77d545bb0f640b7224fe Pick-to: 6.3 6.2 5.15 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Re-enable cmake build test for qtwebsocketsJuha Vuolle2022-01-112-8/+36
| | | | | | | Task-number: QTBUG-92967 Pick-to: 6.2 6.3 Change-Id: I2c138fd2614c08936e4253ec58c82d282cd726f3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Port QWebSocketProtocol::versionFromString() to QStringViewMarc Mutz2021-12-173-4/+5
| | | | | | | | | It's not public API, so there's no point in using QAnyStringView here. We control all callers. Pick-to: 6.3 Change-Id: I1ca9135b4fa7d435e5a21534842c002509f1b7ff Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* QWebSocketProtocol: fix potential UB (signed overflow) in masking operationMarc Mutz2021-12-171-1/+1
| | | | | | | | | | | | The size of the payload is a 64-bit integer, which the loop counts down. If the size is > INT_MAX, then we'll overflow the int i used to track the current position in the mask. Fix by using an unsigned integer type instead. Pick-to: 6.3 6.2 5.15 Change-Id: Ia3b8d42ae906eb03c1c7399cb1137a08121fcde3 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-161-1/+1
| | | | | Change-Id: I76e64294fb4f1a099db20c69b4c7963cdbd41b37 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-161-2/+2
| | | | | Change-Id: I965fd7f91dc0a76a0bfb489b93bb74c78022bc4d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-151-7/+7
| | | | | | | Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: Iac4cb61d45a9ca0d19ebc1f43bf281cb2dc52f10 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-121-2/+2
| | | | | Change-Id: I302107459cfe6019b5bf3cbf71004eda0e3c108f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-111-2/+2
| | | | | Change-Id: I313eef38c91d6a930907bfe754374d20e60fe54d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Reuse qtbase's HTTP header parser to avoid a reinvented wheelØystein Heskestad2021-12-098-153/+108
| | | | | | Fixes: QTBUG-80700 Change-Id: I7b713fd869ac802d5eee8ebb8d90a2115365b509 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-091-2/+2
| | | | | Change-Id: Ib65f70fe0603a79d0d11d0038c1e16d4495ec570 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-061-2/+2
| | | | | Change-Id: If33f2c7c4640a7881c60176d5002e9b9d550f201 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-12-021-2/+2
| | | | | Change-Id: I7b9e51c15a6e8bfdfb8900b21929c69f5069664d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing FDL license fileKai Köhne2021-12-021-0/+451
| | | | | | | | This is referenced in the .qdoc license headers. Pick-to: 6.2 Change-Id: I96f079c2f6c1d565f80da926ac901cd1b4734300 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2021-11-261-2/+2
| | | | | Change-Id: Ifdb0819fa6b5dc891e450197c645c85ba8202ce6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
View Lorry Controller Status