summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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>
* | 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>
* | Stabilize tst_QWebSocketServer::tst_handshakeTimeoutv5.15.0-beta2Mårten Nordheim2020-03-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | The test was a bit flaky which seems to have been due to the short timeout. Increase the timeout a considerable amount, it doesn't matter much to the runtime anyway: the test still takes around 5 seconds to finish. Fixes: QTBUG-82559 Change-Id: Ie14ea204de1cc7ac2951144099d5be88adebef04 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-022-8/+6
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: If65be10a7c86e7b4173fd31f1d277c63c6accb0a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Revert "QWebSocket - do not use deprecated member-function"Allan Sandfeld Jensen2020-02-271-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 938ad6373415fa8b0767a987c37ce51ec546859f. Reason for revert: Was undeprecated and replacement removed Change-Id: I79d6e931d72ec518a43fe058e1067b3754f6cf05 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | WebSocketServer: Add Q_(UN)LIKELYAndre Hartmann2020-02-261-6/+6
| | | | | | | | | | | | | | | | ... to optimize code that is used for error handling. Change-Id: I62fe11d34d32c6784e960505fccbf529a3265d23 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-251-1/+1
| | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: I90199c05f683df18dffe796227fc8e4c0ef9f72d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-251-2/+3
|\ \ | |/ | | | | Change-Id: I69ac9d8a828ba664e38b1f5abdfd0830f55c134e
| * Doc: fix missing closing commentAndre Hartmann2020-02-241-0/+1
| | | | | | | | | | Change-Id: I2e1f4893b1b4c1270630101c390b937611e5d5e2 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Doc: fix links to autobahn testsuiteAndre Hartmann2020-02-241-2/+2
| | | | | | | | | | | | Fixes: QTBUG-69425 Change-Id: I28e03da927c7a9b1cbfb91a0aca32866c2e653ea Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2bae5688cc62bffed1cfccc45e7129cf00a769f8
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: Ibcb0063877543a2cb09ded212e0940fb45280c71
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\ \ | |/ | | | | Change-Id: Iff98ea3277da7e35af6567680d0b84755e30e1af
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I84594b23a2703886e96e73758c26f4cecc1370d0
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-211-0/+20
| |/ | | | | | | | | | | | | | | | | + 3aab83b37baf03daa2aa97a708831d1f7dce8de0 Remove extra deleteLater (already done in onSocketDisconnected) + 59ad9ecf70fef2032dea01330d276c1fac20b724 Add binary compatibility file for qtwebsockets 5.14 branch + 737a86f30a78add874b4bff310d4f84f49cc9b50 Bump version Change-Id: I8d784ef67017de93eab7967dac304d14bf1fada3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Change QMap to QMultiMapMårten Nordheim2020-01-234-6/+6
| | | | | | | | | | | | | | Because insertMulti is deprecated Change-Id: I3965ea7159b2516b35c45072115eba1ab621b89a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Stop forcing deprecated ssl protocol versionMårten Nordheim2020-01-172-2/+0
| | | | | | | | | | Change-Id: I422a2498bb940f801484d3f2e6e5d59edd637514 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | QWebSocket - do not use deprecated member-functionTimur Pocheptsov2020-01-151-1/+1
| | | | | | | | | | | | | | | | Use 'socketError' instead. Task-number: QTBUG-80369 Change-Id: I30527721677be0fc0f71ca33b08f608472bc8b71 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-0/+6021
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic89c6250fae297177b4990de302b4bde71709216
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: I486dace1520c7fc06e6233da8d1e0a52c7869cdb
| * Add binary compatibility file for qtwebsockets 5.14 branchMilla Pohjanheimo2019-12-161-0/+6021
| | | | | | | | | | | | | | BC file built against 5.14.0 added. Change-Id: Ib72e1fd443bf88cec944ab451edcc43ca070a135 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-143-7/+37
|\ \ | |/ | | | | Change-Id: Icd1a2fd565d5d85ac6d1378578a92dbb1a9692ce
| * Remove extra deleteLater (already done in onSocketDisconnected)Franck Dude2019-12-131-1/+0
| | | | | | | | | | Change-Id: I671d93ccd766fed4fff797930804ab748cbb27a1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-132-6/+37
| |\ | | | | | | | | | Change-Id: I3445dc11f83f37a784867762691b372df47ff938
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-261-0/+35
| | | | | | | | | | | | | | | | | | Change-Id: Ic759bffc47f236217fde5db2c33260577366efc1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * Don't add port in Host header unless specifiedLander Noterman2019-11-211-6/+2
| |/ | | | | | | | | | | | | | | | | | | | | No longer add port to Host header in WebSocket handshake unless it was explicitly specified in the URL. This change fixes issues with some WebSocket servers rejecting the connection if the Host header does not match the URL. Fixes: QTBUG-77526 Change-Id: I9b028ce434416e61cae7b217d2eafe621d2660b4 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Add protection against handshake header too largeFranck Dude2019-12-131-1/+9
| | | | | | | | | | | | Task-number: QTBUG-70691 Change-Id: I54b9f7157e5830b9efd8bae7d4777218857249b1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Fix websocket handshake request header parsingFranck Dude2019-12-133-8/+33
| | | | | | | | | | | | | | | | | | | | | | Header ends with \r\n\r\n but there might be more data inside the tcpbuffer Never read past the header Task-number: QTBUG-70000 Change-Id: If3d4cb362646e43a91faf00f89e50510ff00fa56 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Cleanup QWebSocketFrameChristian Ehrlicher2019-11-263-162/+26
| | | | | | | | | | | | | | | | | | | | | | Remove QWebSocketFrame assignment and move stuff by our own - the default ones are good. Also reorder the members to reduce the padding (56 to 48 bytes on 64bits). Change-Id: Ib4628628af924c36ad3cd9bf67ce72752ef97ff5 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-161-25/+0
|\ \ | |/ | | | | Change-Id: I9b0aaaa5d918a28bdd388e3c1988e0bc804255db
| * Doc: Remove broken documentation commentsTopi Reinio2019-11-111-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | QWebSocketServer::nativeDescriptor() and its setter were documented twice, with the duplicated versions under Qt6-specific version check macro and marked \deprecated. QDoc still parses those in Qt5 as it doesn't respect the version guards - remove the offending comments for now. Fixes: QTBUG-79816 Change-Id: Ie40190c9d32f91efd3428b7f884c9ad923a2bb0e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\ \ | |/ | | | | Change-Id: I590fe7a055b7246923d75dcce0f41075a44b0892
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic8cd4116fcfa47f7457d8a630274d6745723c858
| | * Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-181-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | + 465c6c3914455e8ed20f938e5d4a35e6decb446c Add changes file for Qt 5.12.5 + 1deee2a4965fd7dc8a44c6d769519c4cbb11da4f Binary compatibility file against Qt5.13.0 for QtWebSockets + 24a9e0f961d84af037999771948d3d3d9c683a6c wasm: make sendBinaryMessage work in threaded mode Change-Id: I8a1c4a4cf79b9096c7cc735b936ca64e225faaff Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: I80b008b3cc1cf483656096bade145f05917defb5
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-261-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I56626d23b09e833c162cacac6386c712d67236ec
| * | Update plugins.qmltypes for 5.14Kai Koehne2019-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: Ie1de2c3cf46edca2b1441ff94a9bb50cb507c057 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-123-4/+46
|\ \ \ | |/ / | | | | | | Change-Id: I258a6e38c9dfb6ac18ffaa5885cf7337aa99e032
| * | Add support for chrono versions of handshakeTimeout functionsv5.14.0-beta2Mårten Nordheim2019-10-093-4/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And rename the int-version of the getter to enable the scenario where someone does not have chrono. From the 5.14 API change review. Amends 2e54dbe86eac61e87782a138dbcc158cb6b10cd9 Change-Id: Icf2f2a3aebc2216defd0a3a569544c4270ddf05a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-243-4/+52
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-243-4/+52
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I466a4eec6c2aa74f560f4a2acf01d0f84ec328ff
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta1v5.14.0-alpha1Qt Forward Merge Bot2019-09-173-4/+52
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-173-4/+52
| | |\ \ | |/ / / | | | _ | | | Change-Id: I4052a4c238a0c59b1a0fc01ad3fd6ee6b714595b
View Lorry Controller Status