summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.4.3' in qt/qtwebsocketsv6.4.36.4.3Qt Submodule Update Bot2023-03-121-2/+2
| | | | | Change-Id: I7b64a06a667e98f183f8a9f5063e9a95f6a1e13c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.3' in qt/qtwebsocketsQt Submodule Update Bot2023-03-111-2/+2
| | | | | Change-Id: I23ca51457a807bce7077341d7ec45204fdcfe9ac Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.3' in qt/qtwebsocketsQt Submodule Update Bot2023-03-081-2/+2
| | | | | Change-Id: I9da76b3df7cf973e9389c1e5e47de25f1dd87a91 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.3' in qt/qtwebsocketsQt Submodule Update Bot2023-03-031-2/+2
| | | | | Change-Id: I43053526699f56419268b28c290d4154a1ec2f63 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.3' in qt/qtwebsocketsQt Submodule Update Bot2023-03-011-2/+2
| | | | | Change-Id: I8a82bfaf7873d5b5edcdaa1237b024ba2b432324 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.3' in qt/qtwebsocketsQt Submodule Update Bot2023-02-231-2/+2
| | | | | Change-Id: Ia6efe2152dae7009d6bfcfc715527fdb5fe988af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-02-211-2/+2
| | | | | Change-Id: I0226b0ab860f3978bc2226f0e354659149a11f93 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-02-131-2/+2
| | | | | Change-Id: Ie66d153a1c0e1c390891408ee70915a4da81c3c8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-02-101-2/+2
| | | | | Change-Id: I4a846dc92410ef72012a7a47c52429b4ba3e0ca3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-02-021-2/+2
| | | | | Change-Id: I97458dd041ddb1fb20d8396ddccccddd604c9bf7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Revert "Blacklist two tests in handshakerequest"Edward Welbourne2023-01-311-5/+0
| | | | | | | | | | | | | This reverts commit 9486a8053edd0eab68a03178effebda0d5194607. The bug that caused this has now been fixed, so presumably these tests should now be OK again. Change-Id: Ifed83aedccc32cdd68600f94c1b3c5b8d5c7c8b9 Task-number: QTBUG-84315 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 92fa05e8721dc29984a544686c646a77b9531c95) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-311-2/+2
| | | | | Change-Id: Iefa5490bc79004db3727684f6a76359c50d5e0c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-251-2/+2
| | | | | Change-Id: I89a03e4dc74ea14e09b2d406f3f47efb020b3261 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-241-2/+2
| | | | | Change-Id: I7c79b7c09731d720da8350f5ff879af5a7adebec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-231-2/+2
| | | | | Change-Id: Icae23ad328d300a674c36608497d5789f454f4ff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-201-2/+2
| | | | | Change-Id: I63a95049b5146c1f396a2a2cafc9f2f1e25a88ff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-181-2/+2
| | | | | Change-Id: I99cb0db9a643239c1a276e6eedd211f7459662fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-171-2/+2
| | | | | Change-Id: I1cfafaca275c3931552cafbe714bbc841c4c192f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-161-2/+2
| | | | | Change-Id: I87113c025b72e80f079a4a1d857c0f495b8bddbd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-131-2/+2
| | | | | Change-Id: Ib368cbf3f889eed8669f61f4984df9e4e0f8be06 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-091-2/+2
| | | | | Change-Id: I50bce30cbeead57f4bde63f3754b8c4757d28e5e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-041-2/+2
| | | | | Change-Id: I9004520005e61f91f39618b44a2263d2667085ab Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2023-01-021-2/+2
| | | | | Change-Id: I55965e6cbbddcd7d30873fafe3bf7104fef101cf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.3Jani Heikkinen2023-01-021-1/+1
| | | | | Change-Id: I6e8c67c7ea3e454db2698f1be2af3f2f4d9770cb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-12-291-2/+2
| | | | | Change-Id: I17d7aca5e9eebd90f29f4af6d480897ffa0fa68b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: fix heap-use-after-free when using deleteLaterLorn Potter2022-12-282-4/+7
| | | | | | | | | | | | | QWebSocketPrivate was getting destroyed before the emscripten close callback was getting called, which was then calling back into the already destroyed object. So we set the UnconnectedState before it gets destroyed. Fixes: QTBUG-108996 Change-Id: I8ebbe5a55188a31209a95d2a71eea2faee3465ad Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit c321349f285913dd32718e74ad48c5972f6d1f87) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-12-201-2/+2
| | | | | Change-Id: I65ed5d459d5e484497180a6e547b7d9f84307f42 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Rewrite translated string to not include '(s)'Mårten Nordheim2022-12-191-1/+1
| | | | | | | | | | | | It is not always possible to translate such strings, and the number of occurrences don't matter, it's an error as soon as there is 1. Amends 99ebe2f669258b3919a0933ffd5d4c85fb13c0c0 Change-Id: I4b12311813b26cd6e8e21e55826ec60dd301692a Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> (cherry picked from commit 3469b96b64566b6164b2a684c5a0d2def49db946) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Disconnect when handshake failsMårten Nordheim2022-12-151-0/+2
| | | | | | | | | It is unexpected that websocket does not disconnect once it knows the handshake has failed. Change-Id: I11e64745ffdb01c11ac79739cf7f384ad6cc4590 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 7efdec16d9f6116fc6c13bc3ae7c9b9e229e5a49)
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-12-061-2/+2
| | | | | Change-Id: Ib46fae824f726c76766545243759bad9ea115540 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-12-011-2/+2
| | | | | Change-Id: Ifc7ef4ba74dcc3602ee3c1793cc1643691e244a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-11-291-1/+1
| | | | | Change-Id: I68fe29e71c25bb5ebea3f18a6816fe8733f289ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QWebSocket: honor subprotocols specified with setRawHeaderMårten Nordheim2022-11-244-19/+50
| | | | | | | | | | | | We would error out with a ConnectionRejected if the server accepted one of the protocols specified directly in the header since we did not consider those at all. Fixes: QTBUG-108276 Change-Id: Ifbb316c9d4871fd764e03c74caefa10f5b757155 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 69e2b30057003c0ed17c3478d60fea249546a168) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-11-231-1/+1
| | | | | Change-Id: Ib02d7cccb62086d58622a6421101dc1b1eaacb96 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QWebSocket: check correct variable in if-statementMårten Nordheim2022-11-222-1/+72
| | | | | | | | | | It's _usually_ correct, but if all protocols have been filtered out then it will be an empty string. Change-Id: I3aa3221b7e36cfd253cd1152b13e57183bf4f905 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 0fbd3decd0dd694063edd06a174f137ec30d3741) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-11-211-2/+2
| | | | | Change-Id: Ifc2e883486dee4c92f40e3864efe1bf964cf2590 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-11-181-2/+2
| | | | | Change-Id: I984f08bec0b4fd5d614e10c0e9a322ddc11347a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Port from qAsConst() to std::as_const()Marc Mutz2022-11-151-1/+1
| | | | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. This is a 6.4 re-run of the script we ran in dev, in order to avoid conflicts between the branches when cherry-picking. Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Port from container::count() and length() to size() - V5Marc Mutz2022-11-1510-335/+335
| | | | | | | | | This is a the same semantic patch (qt-port-to-std-compatible-api V5 with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to avoid cherry-pick conflicts. Change-Id: I9621dee5ed328b47e78919a34c307105e4311903 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-11-141-2/+2
| | | | | Change-Id: I5b79fd8b21a69f27ba28ba130e3ac392c528d0ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.2Jani Heikkinen2022-11-111-1/+1
| | | | | Change-Id: I90e08bbf6ec372c348092494a9ac44ddd7c9d724 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-11-111-2/+2
| | | | | Change-Id: I7cd0ea87a99501ba7ff89f0b4b48d22ec1fa1da1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-11-041-2/+2
| | | | | Change-Id: I38f9f15f4e0a3c64f232e305deaec6e2d2c7c4db Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-10-311-2/+2
| | | | | Change-Id: Id27a13304a6b60c1c2a3d7e1a74f3f1a5d2bb4d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-10-271-2/+2
| | | | | Change-Id: I91aa4287cb0441155d9e1b97b39092d4e21383a0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-10-261-2/+2
| | | | | Change-Id: Ib1f4d8b1253399fe8e53705d9317ca47d6e99cfb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-10-201-2/+2
| | | | | Change-Id: I06b372f3125bad79bfc6971ce7f8ae081b7c591f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-10-191-2/+2
| | | | | Change-Id: I738af0056ba0eeb7a318e0c11533dcaac878fff0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-10-181-2/+2
| | | | | Change-Id: Ie0ce6e6a4b7b5bfa4db0a566d54739a301bad35a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-10-171-2/+2
| | | | | Change-Id: I69e703c7907153bed1148e65825f9722ccaba793 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>