summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.4.0' in qt/qtwebsocketsv6.4.06.4.0Qt Submodule Update Bot2022-09-231-2/+2
| | | | | Change-Id: I0995176703f531f8e7dd669e73c873075445531e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtwebsocketsQt Submodule Update Bot2022-09-201-2/+2
| | | | | Change-Id: I87dc9eabded621d70b7867b5ea036566b25fd8bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtwebsocketsv6.4.0-rc1Qt Submodule Update Bot2022-09-131-2/+2
| | | | | Change-Id: Ib26e8f67dc4f07224961f53342067b0a261a3d6a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: fix websocket use from worker threadLorn Potter2022-09-131-1/+1
| | | | | | | | | | | self is the current window or WorkerGlobalScope Fixes: QTBUG-106372 Change-Id: Ia23f8bd147d729d224ba8de0d44c07877ba24631 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit beb83bae7c54fb798fe13358cde52aee0f1abef3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtwebsocketsQt Submodule Update Bot2022-09-121-2/+2
| | | | | Change-Id: Iaea0ecdf207812f8a345e2ff9d4ba6ca3419fe73 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtwebsocketsQt Submodule Update Bot2022-09-091-2/+2
| | | | | Change-Id: I1a479599d2d10a94457ecc324f44ee6fb034d5b9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qtwebsocketsQt Submodule Update Bot2022-09-081-2/+2
| | | | | Change-Id: Ifc1e7d4cb97f62309a21a31a07d1caca57dd4834 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QWebSocketServer: update handshake timeout to keep up with QSslServerMårten Nordheim2022-08-312-7/+24
| | | | | | | | | | | | | | | | | | A side-effect of this is that the timeout is now duplicated. The TLS handshake first has the 'msec' timeout, and then the websocket handshake has the same 'msec' timeout. [ChangeLog][QWebSocketServer] Due to the introduction of a standalone QSslServer, with its own timeout handling, the setHandshakeTimeout() function now applies the same timeout to both the TLS and WebSocket handshakes separately. Fixes: QTBUG-105851 Change-Id: I6c515e0dcdf83fa452979b06ab5f890c8b14b184 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> (cherry picked from commit d885e441310c1f69b306a0eadbafde1058aa389a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsv6.4.0-beta4Qt Submodule Update Bot2022-08-261-2/+2
| | | | | Change-Id: If329a3463e02686a43dd2cabbf7bcdb8de03eb6c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-08-251-2/+2
| | | | | Change-Id: I87f5c034316b2bddd9b7ea5a429537ca9dac2e30 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-08-221-2/+2
| | | | | Change-Id: I6f777dd3039b39cf79bc1d6ce34fa2aede539069 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-08-181-2/+2
| | | | | Change-Id: I9472cfa52598a55a260d613e6bca275d07def0e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: improve close code messageLorn Potter2022-08-182-3/+33
| | | | | | | | The close reason from emscripten was usually empty, so provide one. Change-Id: I0c0617c805cc00aa9a575f05c8319560e33569d2 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit d46a70113fed1483bea3c44f5e39d64930cfff07)
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-08-161-2/+2
| | | | | Change-Id: Id8d6c1973ae296eef180515f3661874173f3a0a7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: fix use after freeLorn Potter2022-08-161-8/+10
| | | | | | | | Task-number: QTBUG-105087 Change-Id: Ib9e06b90938b66394d2be9eb7f4f3a283ee80626 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 4d943068949ca2411ca69c902def9d7e7c826e44) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-08-151-2/+2
| | | | | Change-Id: I0bcb7b8b2b1da8b3bd258672ba01da47062b5927 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsv6.4.0-beta3Qt Submodule Update Bot2022-08-111-2/+2
| | | | | Change-Id: I2a0b57fc0541e422776581ca21c1524ceda74c47 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-08-081-2/+2
| | | | | Change-Id: Ia998287ff446d9e16feb12cbfcd931238279c162 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-08-021-2/+2
| | | | | Change-Id: I4915fc4d49ee2ddbd0f3be96ad54943bf7c1fada Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-07-281-2/+2
| | | | | Change-Id: I696417b66f207886562acf42e629d9917407103e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-07-271-2/+2
| | | | | Change-Id: Ic3632a099d1eebe397b40132f05808f1103dbc0f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-07-251-2/+2
| | | | | Change-Id: Ida0fce66f32556d1421a92b39eae688ee077d670 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-07-191-2/+2
| | | | | Change-Id: Ic477714a6839126029aec7db64f26b4feb04c119 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-07-151-2/+2
| | | | | Change-Id: I85da248245b1f0cc1eee2a57f54bc6458b8e45a3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-07-131-2/+2
| | | | | Change-Id: Idefb8aba40567da389f24e3c44f1752618480e30 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsv6.4.0-beta2Qt Submodule Update Bot2022-07-051-2/+2
| | | | | Change-Id: Ia2d792d9a06aef37d25337ef25eb86540f511f46 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Handshake: Pass max header field size to the parserMårten Nordheim2022-07-051-0/+1
| | | | | | | | | | | Following e3ea1d02e6a2cbc63e8ae6fff6ccae49258fe5a2 the defaults values are a lot higher and can be externally adjusted. So, we pass our limits to the parser. Pick-to: dev 6.3 Change-Id: I712c0b59a171ee1e1f9be7879670836bff8392f7 Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-06-281-2/+2
| | | | | Change-Id: I8da2950796be2c19f1e3a45cc9e77f9f50a999c6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-06-211-2/+2
| | | | | Change-Id: I979ebd1376757a03dba1d698e79c2f485b338b1d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use standard macros and make move constructor inlineAllan Sandfeld Jensen2022-06-212-6/+8
| | | | | | | | Change-Id: I670fe7d2dbd7d723d554155b4a822f0f85688f4c Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit b4d35eed35d0cb6617c8240b72e0dc1fe6a405b3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-06-141-2/+2
| | | | | Change-Id: I1eef3a55b4cfbe324465417ee53bdeb204de268c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use SPDX license identifiersLucie Gérard2022-06-1392-3967/+207
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: Ief6ca28118c5ce0abe5dccf1854731cf2215e2b6 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 93eeaf4c6792c91d7932d14ba3c66131068d5789)
* Update dependencies on '6.4' in qt/qtwebsocketsv6.4.0-beta1Qt Submodule Update Bot2022-06-111-2/+2
| | | | | Change-Id: I0b54966a0f43e13bc042bd20ff086c052dce83de Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use QSslServer from QtNetwork and remove own private implementationØystein Heskestad2022-06-094-270/+34
| | | | | | | Task-number: QTBUG-100823 Pick-to: dev Change-Id: I09d855a7763d218b9dad5667c29a28cb5351e98f Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
* Update dependencies on '6.4' in qt/qtwebsocketsQt Submodule Update Bot2022-06-081-2/+2
| | | | | Change-Id: I9c5e16ed8032ad271ec617d121092ba5fe7c8abd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-05-311-2/+2
| | | | | Change-Id: I8b6322f5c955ba73b202069bcb152207699d991b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-05-271-2/+2
| | | | | Change-Id: I78d48357761bc9170729ca3a73d5d2ed21a1372d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-05-241-2/+2
| | | | | Change-Id: Ibd13951dff2f106338ebbe906083800852147ab8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: package qml test dataAssam Boudjelthia2022-05-181-0/+5
| | | | | | | | Pick-to: 6.2 6.3 Task-number: QTBUG-88846 Change-Id: I7505f68e99d173edd93770b2b37c77ecc2b128e7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-05-171-2/+2
| | | | | Change-Id: Iaf1dfb5d201916c23eb985e5bba60968d3e2599d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-05-161-2/+2
| | | | | Change-Id: I8b719ec3ac0ee9df4c15429ca415440383b5e7ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-05-121-2/+2
| | | | | Change-Id: I5548fa6ce790b53a3a37489a9575411229040730 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QtWebSockets: replace qSwap with member-swap where possibleMarc Mutz2022-05-111-1/+1
| | | | | | | | | | | | | qSwap() is a monster that looks for ADL overloads of swap() and also detects the noexcept of the wrapped swap() function, so it should only be used when the argument type is unknown. In the vast majority of cases, the type is known to be efficiently std::swap()able or to have a member-swap. Call either of these. Task-number: QTBUG-97601 Pick-to: 6.3 6.2 5.15 Change-Id: If9c28df7d788856fb1653d2fae2a68ff42a12b23 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-05-111-2/+2
| | | | | Change-Id: I9d3afa3b4954d2586efbb25363c91cb20281cf2b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix remaining documentation warnings and enable doc testing in CITopi Reinio2022-05-093-13/+14
| | | | | | Change-Id: If1238f62ed41fcf17cb794ffcf68a0ee3e17b030 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-05-041-2/+2
| | | | | Change-Id: I4fce3e4c91703f0265d979298eb73be8aee63012 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-05-031-2/+2
| | | | | Change-Id: I31f4025269cf41245f4b2147cccaaf6e779cf7d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2022-04-281-2/+2
| | | | | Change-Id: I14058c697293af9fb27f997e4ae76b8ebfc37e90 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* wasm: Refactor to use websocket.h APILorn Potter2022-04-273-105/+185
| | | | | | | | | | | This brings better use with threads and getting rid of bind Change-Id: Ibf4bc128210fb8bbbb876d6244c48d3241c15194 Fixes: QTBUG-101682 Reviewed-by: Arno Rehn <a.rehn@menlosystems.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* 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>