aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgpl5.15Tarja Sundqvist2024-01-041-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I58bcea5e7942f37cc6b17ce8935a715ecc3a4fef
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: Ib5cd39f9afb047c7ab2b8cb2091fb681ec0fffe7 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-111-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Icda8d3d90f1afdf08ecfbed41b9a119a7bd58dbd
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: I0fd5f220ef835cf84c1ac38eef5ff70c0457f42b
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-091-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ifa514edce3ade49d295308c528822940cb236d94
| * Bump versionTarja Sundqvist2022-06-151-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-241-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Id1c7f0ccd351f4825f51ad0699a98849e36745ae
| * Bump versionTarja Sundqvist2022-04-061-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-233-6/+10
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I7754f1f94b830ea63edad5e7705ece5d0007c47c
| * Fix setting of socket optionsJoni Poikelin2022-01-121-4/+8
| | | | | | | | | | | | | | | | | | Socket options need to be set after connectToHost() to take any effect. Change-Id: I006a8c59ba1c78d5edaa77d545bb0f640b7224fe Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 647922b1122977625b8f32fbc0bb2e9339afb4a3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
| * QWebSocketProtocol: fix potential UB (signed overflow) in masking operationMarc Mutz2021-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The size of the payload is a 64-bit integer, which the loop counts down. If the size is > INT_MAX, then we'll overflow the int i used to track the current position in the mask. Fix by using an unsigned integer type instead. Change-Id: Ia3b8d42ae906eb03c1c7399cb1137a08121fcde3 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 38218494a65049b5f9da7a8aab012a969c7dac86) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ibf6948ceac4124a1a84490b7554c9359c21acc17
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I3cf55c97794d998cce5b2ca7f601b2f6892664aa
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I423f8818386bc85feb820950d4e7e8cd6a921ff9
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-163-4/+13
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ia4e6ffc419e24148f37c89e661ad7b2558f53371
| * Clear frame before emitting signals to prevent duplicating messagesØystein Heskestad2021-06-301-3/+7
| | | | | | | | | | | | | | | | | | [ChangeLog] Clear frame before emitting signals to prevent duplicating messages Fixes: QTBUG-87279 Change-Id: Iab296f443943eeec3b2a0fbb4f79c5abb2605ca7 (cherry picked from commit d196801706821a890bda8b22508c2957a50eff25) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Pass ignoreSslErrors to unterlying QSslSocketJens Trillmann2021-06-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | When setting ignoreSslErrors(List<QSslError>) during the sslErrors signal handling the call got ignored. Only the internal config for creating a QSslSocket would be updated but not the current QSslSocket. The request of the caller to ignore specific QSslErrors would be ignored. Change-Id: I6aaea2111fe1d26e07e6eaaa7532ae1b14a187a8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit b13f23d232cfdd372ef812d427872d52eed2337e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-06-021-1/+1
|\| | | | | | | tqtc/lts-5.15-opensource
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I79296219565e0c1e3575950b4432e53c61a741ce
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I83456222415d422f07bf9015b58bdb891c412574
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: If74707bef7b8630077c09b29fe8dbae6b0cd316f
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2236-710/+710
|/ | | | | | | | | | | This reverts commit 43f9a2dbf9bff83203db4ebe969af3d0523ae5c5. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Ic420c5575da14b99e48eb620d9e8dc63fb6a02f0 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-2736-710/+710
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtwebsockets. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4218 Change-Id: I91525398b24d696254f551f3db57107b5197e38f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Clear frame on reconnectAllan Sandfeld Jensen2021-01-261-0/+1
| | | | | | | | | | | Otherwise partial data could leak through to next connection and cause odd behavior Fixes: QTBUG-88923 Change-Id: I6c75e6325527379bcdca0b9819a89437d0658893 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 9f6449ef1b6d1e7651f181585f1c35d6722bb87a)
* Add doc note about internal ping/pong handlingAndre Hartmann2020-12-211-0/+3
| | | | | | | | Change-Id: Ic74407b17d03fbfd3077ac1dd4f689a7207ccb51 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fa6c7e50321e7be048297e5d0ce8503647a9488e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QWebSocket: websocket is a websocket, not a TLS socket necessaryTimur Pocheptsov2020-11-242-2/+18
| | | | | | | | | So we delay TLS initialization until it's really required (wss scheme found etc). Fixes: QTBUG-88663 Change-Id: I0c1cfa03b189bfa8e41aad27918fe1998de19ea7 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-281-0/+28
| | | | | | | | | | | - 55e06385d520c96b0342a5007c6889d936c82845 Add changes file for Qt 5.15.1 + d469b93b98e8c23de2fb10a84a71a7456b3c02ae Bump version + 953ac709b6bb8b8e9dc3302448faaa8b68e6a9f4 Add changes file for Qt 5.12.10 Change-Id: I978e690530382773ad492ffb75e6987b99e376ae Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit f73735911b2124ef16aa39228bf8f89ee900ba5d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I9475cc7e25faf60ca48dd1b0c1a4af1b40df1a04
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: Id5876775cff814d04e17a962ad391a3d5f141c3c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 4156135c236ae2799f40fae1741c038d1f150934) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: If442310391112ff2a6d246958086acab9208558f
* Add changes file for Qt 5.15.1Antti Kokko2020-09-011-0/+20
| | | | | | | | | | | | | + 34010e649734fe7a41d1a0280c606b15de5c2799 Make sure child QObjects get moved-to-thread along with the owner + eb2ddd0cb6b6f6ad391b5b43dbc1e88e41238417 QSslServer - adopt the newly created socket + 57e447f19afb9fa58add302547c966e6f5c3b16f Doc: Remove 'nolink' hack for WebSockets + c5cad78cc060ddc354647123bf69036a2ef00b33 Bump version + 90f0fc770bad90c40fa3be03501a794401d1f414 Add binary compatibility file for 5.15 for QtWebSockets Change-Id: Ic06040456cabc0bfce21abc09eb63d552ec04bb0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 9a0dd9a7b74a405488c4922a922d8a2ed8e8e28a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add binary compatibility file for 5.15 for QtWebSocketsMilla Pohjanheimo2020-08-171-0/+6031
| | | | | | | Binary compatibility file added. Change-Id: I985f7f43ca3231f47633b9cc7190068586fc50e5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: Idaa694be6cb667661fe4b84f8300fe758be1d5d2
* Doc: Remove 'nolink' hack for WebSocketsTopi Reinio2020-07-021-21/+0
| | | | | | | | | | | | This was used for preventing unwanted auto-links. We have since introduced a different mechanism to handle these (the 'ignorewords' qdocconf variable), and this workaround now causes problems. Fixes: QTBUG-85388 Change-Id: Ife6183accf46a3b47f2dc6c988e40cf8f9f24e49 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 4b8f290571d1e3a2f291a07796e0cd4ac2745f74) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QSslServer - adopt the newly created socketTimur Pocheptsov2020-06-261-1/+1
| | | | | | | | | | | | | | | | Like it's done in QTcpServer. In theory, it's possible that 'encrypted' signal is never executed and then the socket is not added to the pending connections (those are deleted in the QTcpServer::close). Thus, the socket object would be leaked. Since QSslServer inherits from QTcpServer, this fix also ensures the documented behavior of the QTcpServer::nextPendingConnection (which is said to return a child of the server object). Fixes: QTBUG-85180 Change-Id: Ic0d923b7a7fe5e3bcea0b9815be1cbe946dda186 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 788d4856330e6f5d251f9b153de3d22b8cf538f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make sure child QObjects get moved-to-thread along with the ownerMårten Nordheim2020-05-184-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 Change-Id: Iee60fe1c498f8f6d1e0c2cfcb2923bd5b9560acb Reviewed-by: Jesus Fernandez <jsfdez@gmail.com> (cherry picked from commit 393fcf8a64748f0c59f47d254667518dba9e2fc3) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* 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.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.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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 15:41:03 +0000