summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * wasm: make sendBinaryMessage work in threaded modeMorten Johan Sørvig2019-09-131-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes two issues in sendBinaryMessage(), one observed, and one theoretical: 1) WebSocket send() does not accept data views backed by SharedArrayBuffer, which is the case for heap memory views when threading is enabled. 2) We have no way of observing for how long send() will retain the memory view passed to it. This means we don’t know when the QByteArray can be safely freed. Both can be solved by copying the payload data to a separate ArrayBuffer, whose lifetime can be managed by WebSocket. Fixes: QTBUG-78078 Change-Id: I73209080db66f38b971f2c8a727b43402357b1a9 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-091-0/+20
| | |\
| | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | | |\ | | |/ / | | | | | | | | Change-Id: Ibaec93eb5919dd6cc1f34e98ad20c57b9998bc23
| | | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-081-0/+20
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | | |\ | | | |/ / | | | | | | | | | | Change-Id: Ie2f07797983e53d0a998e1b0f76a8efd951408f7
| | | | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-231-0/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | + dcf08a4c702f90cc092629078de48a0ad0d68562 Bump version Change-Id: Ia81f727e8ee826590cd33fbb3ad2086e6e7ca2da Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | | |\ \ | | |/ / / | | | | | | | | | | Change-Id: Id47478b5f9ef4a342771d6e718fd5cd7272f5166
| | | * | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-07-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 69f3b6ed8b5036ff2dff9ea1ba232252c8f7d73a Bump version + 9db762ad97338567a614177564f68fee780fefce Add changes file for Qt 5.12.4 + 34c8622dbaafaa67c15a221a6c90390419c28063 Doc: Complete parameter description several methods + 44750221a97f0ad5da51ca51e2f14b701197c306 Bump version + dcf08a4c702f90cc092629078de48a0ad0d68562 Bump version + 9fcd04fc3ca878de0db92f1175bc3cb4ff1e6420 Doc: Replace example file lists with links to code.qt.io Change-Id: Ib6157dc6112e10ffea0e72b320a0402a250905d6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
View Lorry Controller Status