summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.3' in qt/qtwebsockets6.3Qt Submodule Update Bot2022-08-231-2/+2
| | | | | Change-Id: I73b322c5ecf54f8b45de442e600bd316f89c412a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-08-221-2/+2
| | | | | Change-Id: Ife1063057ffdc9ec3bc5fcbb52b4ec24f34628b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-08-191-2/+2
| | | | | Change-Id: I5912741879bf00cf6e6a9ebdf05c1f76518ddbb8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.3.3Jani Heikkinen2022-08-191-1/+1
| | | | | Change-Id: I46d4ca0ced6b65d459632b965c90526fadc59724 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-08-111-2/+2
| | | | | Change-Id: I5c7cfbe6816a1133ac317fd93853e1312e426fcf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-08-091-2/+2
| | | | | Change-Id: I48a246dd14e75776485a44b2c72b119c09e915b3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-08-021-2/+2
| | | | | Change-Id: Ia58b3cf99a90a075b8d7a04e82f497c5a0ddbfce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-07-251-2/+2
| | | | | Change-Id: I459b9b44c2f791f1b1faa897f9f3a1f8fd4cae5d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-07-221-2/+2
| | | | | Change-Id: If5bba4ad31032ff3ea159cbca414ae2defb302e7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-07-201-2/+2
| | | | | Change-Id: I47bc5f0572680e796340ea7253cb4dfbf01345b0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-07-191-2/+2
| | | | | Change-Id: Ib6ffde58cf2f79675b97b2dfb7eefd039593d89b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-07-151-2/+2
| | | | | Change-Id: I3fd74974d4a610ce28d4c7dec1c7fd6eca2e4675 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-07-071-2/+2
| | | | | Change-Id: I268556df4ceccaa59fc70f84be9a3c1db609fdc8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-07-061-2/+2
| | | | | Change-Id: I8c6c81aadce8a7614c97ae97235b167b2ab4a4b4 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-061-0/+1
| | | | | | | | | | | | Following e3ea1d02e6a2cbc63e8ae6fff6ccae49258fe5a2 the defaults values are a lot higher and can be externally adjusted. So, we pass our limits to the parser. Change-Id: I712c0b59a171ee1e1f9be7879670836bff8392f7 Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> (cherry picked from commit 0abd9ba438698bec9588a0fb59073b6fab642f92) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-06-271-2/+2
| | | | | Change-Id: I562b462b37ed3b1be848f8f6d12557ef2296c2d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-06-211-2/+2
| | | | | Change-Id: I7672d66b460ca2d91c8ea3d94ce680cd167821ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.3.2Jani Heikkinen2022-06-161-1/+1
| | | | | Change-Id: I296e0cb8420602979e8942401999aa73de468313 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-06-151-2/+2
| | | | | Change-Id: I5b7bcba23088a57c47e9ef056353eb4167d0e278 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-06-031-2/+2
| | | | | Change-Id: Ia83869bf60255443c1c7312201409f3f7f5ccb0c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-311-2/+2
| | | | | Change-Id: I023e737c5c481bfabb907c417fa816256bd5ab07 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-271-2/+2
| | | | | Change-Id: I1dcfce5e43e1991cafa7ab161453d0dad49708af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Empty pre-release version in '6.3' seriesJani Heikkinen2022-05-251-1/+1
| | | | | Change-Id: If0f77833d2db4b1654ece5c2b381d761c45c543a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-251-2/+2
| | | | | Change-Id: Ia5618b1a6ee53895ab115efa49077a192f3db91f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-191-2/+2
| | | | | Change-Id: I1eefe6b1c1c36a3293bc86ba6db1a82ad58a28c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Android: package qml test dataAssam Boudjelthia2022-05-181-0/+5
| | | | | | | | | 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> (cherry picked from commit a398b65eda5c6da263c440a460220ad47aec1a82) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-121-2/+2
| | | | | Change-Id: Ic2b1a35821ea48eb726f201c6a7655eec8706ab0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-05-091-2/+2
| | | | | Change-Id: Ia1ee290877c6775cc793a184ed06293472268e63 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-271-2/+2
| | | | | Change-Id: I8f6667ba40b5957096ab229f8f0a37462a2e4019 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-221-1/+1
| | | | | Change-Id: I73b2e828b7159622dfb538632e7b4d4f8df25c70 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* 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 Change-Id: I5cb3d9f62f6943d1477c99456cd650b69ab8c86d Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit ab7dd2ac029da966bcd0095b97168fb364d73006) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-201-2/+2
| | | | | Change-Id: Id783c1e665b9139e8cf36b33247588139e34be42 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-191-2/+2
| | | | | Change-Id: If7a404fd5852ce10d1e18fa27882c03e8edd9bff Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-181-2/+2
| | | | | Change-Id: I7e29dfb63055c332101170693f1ec7460ea7be7c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-141-2/+2
| | | | | Change-Id: I208c971093fa566d088385c9d71f1980aa1fe951 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-081-2/+2
| | | | | Change-Id: I96cffc5ce2e59289820fd6f3bb2a604cdefafd8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-061-2/+2
| | | | | Change-Id: I9f355cb1d3491f87dedc65661791d13b2d8cbb33 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-04-011-2/+2
| | | | | Change-Id: I47c1fb740bda27aef4e2abb1e30d220489e50286 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. Fixes: QTBUG-102111 Change-Id: I3955e4b90eb1be0a0ef5dfcf8a46921a086a8b49 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 631fb7665fb53521df2cedb186a8e1e370b2aaa4) Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Revert "Blacklist: test cases blacklisted in tst_QWebSocketServer:"Pasi Petäjäjärvi2022-04-011-4/+0
| | | | | | | | | | This reverts commit 3b012563ac4e0597cba0e6f92edc0e0fc376d2e5. Reason for revert: Should not have been merged Task-number: QTBUG-101333 Change-Id: I972eab01b658a04b9ff456024c3f472674c86e33 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* tst_QWebSocket: fix scope of ifdef proxy-checkMårten Nordheim2022-03-311-2/+1
| | | | | | | | | | Because other tests had made their way inside Change-Id: Ie6fa545a84c2f66e0c2617f498118a3e04eedd0c Reviewed-by: Arno Rehn <a.rehn@menlosystems.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit ebf82dc805354e8d9b1c2f0a45bad6594dbbbd22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.3.1Jani Heikkinen2022-03-301-1/+1
| | | | | Change-Id: Iffdf186cc8e44905ed0ae50b8f46268ba1ecc7f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-301-2/+2
| | | | | Change-Id: I3c522fb8970871e4a0598dd43c7fe11dcfceabf1 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 Change-Id: Ief7a5f845df5b2edaa17c3c652895a4adb7ad3a5 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit acc165cc4ef68832e250c10807d7966f9032af0c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove .prev_CMakeLists.txtKai Köhne2022-03-224-59/+0
| | | | | | | Change-Id: Icaf0fac81f51432c706a948d0986aae68e44fffb Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 7bd0a9f0c6c2d7791a89e304442970b08d8a295a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-211-2/+2
| | | | | Change-Id: I8aca20bb109ad0bc457b3f7b20042c0619b4d920 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-161-2/+2
| | | | | Change-Id: I1fece9ace11b5780fe4c6373c6d26c086550e95c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-141-2/+2
| | | | | Change-Id: I846f23b8bf6765b735f2a4d9218596258b3e6271 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsv6.3.0-beta3Qt Submodule Update Bot2022-03-111-2/+2
| | | | | Change-Id: Ie1d843eb7ad1d7b19c34b3d276a01c316c350f97 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.3' in qt/qtwebsocketsQt Submodule Update Bot2022-03-081-2/+2
| | | | | Change-Id: I67657828f633837cfe7f5338267ba78b420c6291 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>