summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Qt6: Remove single usage of soon to be deprecated QStringRefKarsten Heimrich2020-06-101-1/+1
| | | | | | Task-number: QTBUG-84319 Change-Id: I03279783140af155b5db55f5c0584832af009f8a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-06-081-2/+2
| | | | | Change-Id: I4437ef1ffc8d10e2004b72730c1affb158ebb151 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-081-4/+4
| | | | | | Task-number: QTBUG-84469 Change-Id: I88d02a42879cefaefbbbcf9faa6b5c3a84ec4f1a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-06-041-2/+2
| | | | | Change-Id: I6fabd720ff37e1cfb25394eb94635e894d64651c Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-06-021-2/+2
| | | | | Change-Id: Iacc12e0ec087d8125bebe8b09131e37beb1d18a1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-05-291-2/+2
| | | | | Change-Id: I7af8c184304f7d1b431ded12d0f47e40f230407a Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-05-271-2/+2
| | | | | Change-Id: Id1a82f1e970ef52bb06b294c0d97596f8f0222f1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-05-261-2/+2
| | | | | Change-Id: Id467b425bab40168e25666965278ad733a638d57 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-05-251-2/+2
| | | | | Change-Id: I55619abf2b039e428b15713a4b9d46228d44bd9b Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-05-211-2/+2
| | | | | Change-Id: I0f4466bd92841e51ba979f9974eea48a83bb8840 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Add missing overrideAlexander Volkov2020-05-201-1/+1
| | | | | Change-Id: Ife1899ec8516a7d8b790c2321b6cd61e57772eec Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-05-201-2/+2
| | | | | Change-Id: I3b89d58f62ef58d3bacb71ddc0d3e50a1d02fad3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Blacklist two tests in handshakerequestLiang Qi2020-05-191-0/+5
| | | | | | Task-number: QTBUG-84315 Change-Id: I0bbe1e22adcf7e653d44921d8fc9ec603dc36283 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-05-191-2/+2
| | | | | Change-Id: Ib1adac9b1eb13817bf4d39d9645f1f186e702ec6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-141-0/+23
|\ | | | | | | Change-Id: Ie160fc36884c4326911adfd7b58f6eefc5aac1db
| * Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+23
| |\ | | | | | | | | | Change-Id: Icb6342e997801517178f53c158c7b7fa05d3c718
| | * Add changes file for Qt 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Antti Kokko2020-04-281-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 034c5b8296119f6eb0046ae1276b7261872caa57 Bump version + 92cec7af3ee88673d58e70e5b9a84a0cf55aa734 Cleanup QWebSocketFrame + cea5603ee1a56bb5d177f35ed3f884345875099e Fix websocket handshake request header parsing + db472ab205b37f44cb2d65ad861152cb9f48f2e8 Add protection against handshake header too large + 938ad6373415fa8b0767a987c37ce51ec546859f QWebSocket - do not use deprecated member-function + e3d919e215d987ec8f912c7cec05ba502d4c3f0b Stop forcing deprecated ssl protocol version + 51dd88d8963920b850d79e22b1820d207e0569c7 Change QMap to QMultiMap + a246fb2ae2a810b62147cf64d96410a26b93e637 Update plugins.qmltypes for 5.15 + a844995bb8b48c08c5f6180b727c8f45bd23dfa5 WebSocketServer: Add Q_(UN)LIKELY + 87c9513aed424f0c97a78271f59a34873cc7e522 Revert "QWebSocket - do not use deprecated member-function" + 5bc1a1f85fedd7d65298f0a4c8ea79fb0670c0d7 Use Qt::SplitBehavior in preference to QString::SplitBehavior + ad75d2712a838787488e817eec318fc27bae1786 Stabilize tst_QWebSocketServer::tst_handshakeTimeout + 8c4b6d212c72b8bb59bc687cbc35bbdebe112434 Speculatively increase timeouts in tst_qwebsocket + 2437f81b0022f9524ca467e28c889d8683c464cf Revert "Speculatively increase timeouts in tst_qwebsocket" + ed93680f34e92ad0383aa4e610bb65689118ca93 Add a public api to set max frame and message size (CVE-2018-21035) + 37203fab746060edaccea8abcddc181611ab0555 QAbstractSocket: Fix warnings from deprecated error signal Change-Id: Ia6ac7fed60ad6d80d08be574b0fb1f7e5ef4e5ec Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| | |\ | | |/ | |/| | | | Change-Id: I0ffba653f33728729b5feac6544263bb351fdc34
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-05-081-2/+2
| | | | | | | | | | | | | | | Change-Id: I6e965f2532abffdbf70e7fe62e9c4b64ec7fe45d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Stabilize testAllan Sandfeld Jensen2020-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | It times out on my machine. Change-Id: I6c57167c76eca434b2c64d4938e034452e4d7e02 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-05-061-2/+2
| | | | | | | | | | | | | | | Change-Id: Ia698eb2f2d5da76e4433096738731b33aaddde59 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Make sure child QObjects get moved-to-thread along with the ownerMårten Nordheim2020-05-054-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By parenting them. And to do that without crashing they need to be allocated dynamically. A couple missed "parenting"s caused the object to not be moved to the other thread when the websocket was moved. This caused it to print warnings when the timer was started and stopped since this cannot be done across threads. Fixes: QTBUG-83722 Pick-to: 5.15 Change-Id: Iee60fe1c498f8f6d1e0c2cfcb2923bd5b9560acb Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-04-301-2/+2
| | | | | | | | | | | | | | | Change-Id: Ifa054ebe51a526df0ee2cc7bb17b464717bc1e88 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-04-291-2/+2
| | | | | | | | | | | | | | | Change-Id: I22d9598e52620c0628cb7f6ea2058350d7eaef51 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-251-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I54534f31a04e87c940803539b810a722aad3dadf
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | |/ | |/| | | | Change-Id: Id8cc7b3a41321abda275e7ac7ea0a9dab3862320
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Ibffb68ca8beb6007f68baf9d1cc39201ff762840
| | | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 2d10eaba1607f3efaaf3020e4b7c57a31060177e Bump version + 7554e8839ac230b08a0b670c31a4843ba1f17cb1 Doc: fix links to autobahn testsuite + 9d3eb184c72333a95ee8f9ee33bd51942271de64 Doc: fix missing closing comment Change-Id: I2dabf44acdb95f9e71286091f9f14a4fb3b08d6e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-04-231-2/+2
| | | | | | | | | | | | | | | Change-Id: Ieec2e80b302aeff6ffa80cf42904c7dbadbf4504 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-04-091-2/+2
| | | | | | | | | | | | | | | Change-Id: Ief6789c7ea35db6c8ec9ed4b82236b090ef87949 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-04-081-2/+2
| | | | | | | | | | | | | | | Change-Id: I6df1f3ba6e59fec434b7c2f15e39d1e9fc653e40 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-04-071-2/+2
| | | | | | | | | | | | | | | Change-Id: I3b82010569a375defde61608a64c6590185c8d02 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-04-031-2/+2
| | | | | | | | | | | | | | | Change-Id: If64f9246db35c1e42ea60c4ac221a3785715713b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-04-021-2/+2
| | | | | | | | | | | | | | | Change-Id: I89191d454ce64b9b178986f8e0bbba79c340bb11 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-311-2/+2
| | | | | | | | | | | | | | | Change-Id: I3eb766e30497f7b09eebf1682d19dcec7425f6ec Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-3110-15/+375
|\ \ \ | |/ / | | | | | | Change-Id: I7b3d96575073eb6537b40286c027074969bf8076
| * | QAbstractSocket: Fix warnings from deprecated error signalv5.15.0-beta4v5.15.0-beta3Mårten Nordheim2020-03-231-2/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-82605 Change-Id: Ibaa722ae26a71680426cecc3a0e25acc72d9527b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | Add a public api to set max frame and message size (CVE-2018-21035)Franck Dude2020-03-1910-13/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows the user to set a lower allowed frame/message size for reception. The purpose is to avoid an attacker to exhaust the virtual memory of the peer. Fixes CVE-2018-21035 [ChangeLog] Added public API to set the maximum frame size and message size Task-number: QTBUG-70693 Change-Id: I5dc5918badc99166afdcc8d9c6106247a9f8666f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | Revert "Speculatively increase timeouts in tst_qwebsocket"Timur Pocheptsov2020-03-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8c4b6d212c72b8bb59bc687cbc35bbdebe112434. Reason for revert: It didn't fix the issue Change-Id: I11490a968746255e6f7fd906cddcc3ee36ca6201 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | Speculatively increase timeouts in tst_qwebsocketMårten Nordheim2020-03-181-5/+5
| | | | | | | | | | | | | | | | | | | | | In case it's causing these recent failures. Change-Id: Icdedab57e2e46d332bf1ae9c1d4869a2ed480d94 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-301-2/+2
| | | | | | | | | | | | | | | Change-Id: I4595699621a203c90ab5e0d96ef2e9d8bc936d3a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-271-2/+2
| | | | | | | | | | | | | | | Change-Id: Idd1d5c86f1be4e3b52b8c22eef2ef69bc10d1e02 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-261-2/+2
| | | | | | | | | | | | | | | Change-Id: Ieba0434c83c4707931373cc51701b1a01f9881e3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-251-2/+2
| | | | | | | | | | | | | | | Change-Id: I7775071b63a850187232edfb4853a8e3f0c85df2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-251-2/+2
| | | | | | | | | | | | | | | Change-Id: Ic9f5f350ccf4ff4b7c429ebaa4e03a302b01b3ee Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-241-2/+2
| | | | | | | | | | | | | | | Change-Id: I06cec6e36c500a27b3a90c2a817ec212d707b4ea Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-231-2/+2
| | | | | | | | | | | | | | | Change-Id: I820051a953b56ed017dda8248710fbe3a9a5d68a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-03-2335-0/+703
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts dependencies.yaml coin/module_config.yaml Change-Id: I7df9ac314e99c090379b0d8a66baef1951ad1984
| * | | CMake: Regenerate projects after mergewip/cmakeAlexandru Croitor2020-03-2313-39/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3cdf755e3aae933016b9719ce4c61f53e554ea48 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-2322-226/+6313
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: I1608720522e974c7107f00599a9fb70f17865189