summaryrefslogtreecommitdiff
path: root/src/websockets
Commit message (Collapse)AuthorAgeFilesLines
...
* Migrate to autogenerated cpp exportsAlexey Edelev2021-09-272-13/+2
| | | | | | | | | Replace the hardcoded cpp exports with a generated one where it's applicable. Task-number: QTBUG-90492 Change-Id: Idc2d2d9f7ba2abbff462a27599b9a7b1aa704a4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Doc: Update \externalpage links to RFCsLuca Di Sera2021-09-171-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | The old `tools.ietf.org/html/*` web pages containing RFCs now redirect to `datatracker.ietf.org/doc/html/*`. While the redirection work, our script to catch broken links on dev-snapshots builds of the documentation doesn't handle redirection correctly, reporting it as broken. Both to appease the broken-links script and to avoid an unneccesary redirection the RFC links in `external-resourced.qdoc` were modified to point to the new domain. Furthermore, the link referring to a specific page that pointed to a section were updated to point directly to the section, so that they are consistent with other similar links. The `tools.ietf.org/id/*.txt` links, while still resolving without a redirection, were updated to use an equivalent link on the `datatracker.ietf.org` domain for consistency. Task-number: QTBUG-96127 Pick-to: 6.2 6.2.0 Change-Id: I0b937c9dbfaec0cd4b2aad5bd55fc731d073ca16 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Fix documentation warningsTopi Reinio2021-09-082-2/+2
| | | | | | | | | | * Rename a file included by QDoc to have the correct extension * Add missing \a command to mark a function argument Pick-to: 6.2 Fixes: QTBUG-96287 Change-Id: I9724b67f641ba634c91a74e3e05821f1edfeb4ad Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Use https links for tools.ietf.org linksTimofey Sartakov2021-09-073-13/+13
| | | | | | | | | | Use https links for http://tools.ietf.org links. Currenly docs seems to be available on datatracker.ietf.org domain only, and redirects set up only for https. Http links may not work, if browser does not try to use https. Change-Id: I1f656c10e7478b97ce229c48ad270338bc460d3b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update changes doc with the singular changeAllan Sandfeld Jensen2021-08-252-0/+41
| | | | | | | | | Only the removal of the deprecated API. Pick-to: 6.2 Fixes: QTBUG-94932 Change-Id: Ib7de6b11701d4f39273eb33e75e1cc8fe2deeae3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Doc: Remove unsupported customFiltersKai Köhne2021-08-251-4/+0
| | | | | | Task-number: QTBUG-95987 Change-Id: I48eac76d28f4be45f55b1e1cb7183c7a72fe0b17 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Reinstate transitional methodsAllan Sandfeld Jensen2021-08-201-0/+6
| | | | | | | | | These were introduced in Qt5 as transitional methods, and deprecating the main methods. They should still be here to support API conversion. Pick-to: 6.2 Change-Id: I251c97dca527971bf966335288855aeea10572d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Document new QWebSocketServer signalsKai Köhne2021-08-121-0/+41
| | | | | | | | | Note that, in contrast to QWebSocket, QWebSocketServer misses the continueInterruptedHandshake() method. Pick-to: 6.2 Change-Id: I6d38fa5a814732da40b1941decbe5cd7492bc39f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Doc: Add Changes Qt 5 to Qt 6 page to Qt WebSocketsPaul Wicking2021-08-041-0/+44
| | | | | | | | | Add a basic changes page for consistency with other modules. Task-number: QTBUG-94932 Pick-to: 6.2 Change-Id: I21428ba4bef08b4a9b50386d03c391d13f5545d0 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Remove outdated qmake pro-filesØystein Heskestad2021-07-201-52/+0
| | | | | | Task-number: QTBUG-95167 Change-Id: I32f5c1f9d3a1a7cfd1c7ceea6a887418789bc63a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update since markersAllan Sandfeld Jensen2021-07-161-5/+5
| | | | | | | | | Qt 6.2 will be first Qt 6 release for Qt WebSockets Pick-to: 6.2 Change-Id: I2141785c3f5bf6604418e3d1b8d8c311c916400d Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Clear frame before emitting signals to prevent duplicating messagesØystein Heskestad2021-06-251-3/+7
| | | | | | | | | [ChangeLog] Clear frame before emitting signals to prevent duplicating messages Fixes: QTBUG-87279 Pick-to: 6.2 Change-Id: Iab296f443943eeec3b2a0fbb4f79c5abb2605ca7 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. Pick-to: 5.12 5.15 6.2 Change-Id: I6aaea2111fe1d26e07e6eaaa7532ae1b14a187a8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix QScopedPointer usage warningsAllan Sandfeld Jensen2021-06-212-14/+9
| | | | | | | | | | Switching to std::unique_ptr since we move the data, and mark move operators noexcept. Pick-to: 6.2 Change-Id: I8548a0a2b07cb5108823a081dd1ea68e4bb1800d Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Clear frame on reconnectAllan Sandfeld Jensen2021-01-251-0/+1
| | | | | | | | | | | Otherwise partial data could leak through to next connection and cause odd behavior Pick-to: 5.15 Fixes: QTBUG-88923 Change-Id: I6c75e6325527379bcdca0b9819a89437d0658893 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Add doc note about internal ping/pong handlingAndre Hartmann2020-12-211-0/+3
| | | | | | | Pick-to: 5.15 Change-Id: Ic74407b17d03fbfd3077ac1dd4f689a7207ccb51 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* CMake: Regenerate projects to use new CMake APIAlexandru Croitor2020-12-101-4/+4
| | | | | Change-Id: Iaaa4a44c8cf8735aa17293540e701ababace8155 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Remove Qt5 leftoversPeter Varga2020-12-012-77/+0
| | | | | Change-Id: Ifecb6f90687601a20e719db3ba194e33f3303f24 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Replace old Q_DECL_NOEXCEPT macros with modern C++Allan Sandfeld Jensen2020-10-302-4/+4
| | | | | Change-Id: Iab7b0c45ef3e5c8c042aa906f5eb4d9142b0f6d9 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Use QByteArray operator of QStringDecoderAndré Klitzing2020-10-211-3/+2
| | | | | | | | | | | qwebsocketdataprocessor.cpp:203:72: error: no match for call to '(QStringDecoder) (const char*, qsizetype)' frame.payload().size()); qwebsocketdataprocessor.cpp:293:86: error: no match for call to '(QStringDecoder) (const char*, qsizetype)' closeReason = toUtf16(payload.constData() + 2, payload.size() - 2); Change-Id: Ia56b7b0b6e184ed95abf105d22149b4e07f18551 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsAllan Sandfeld Jensen2020-09-211-1/+1
| | | | | Change-Id: I2f5660c165dbdc504c66ec8d04ab97c349b197fd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix compilation by replacing QStringRef with QStringViewMarcel Krems2020-08-201-1/+1
| | | | | Change-Id: I3f34797df1fbf25be03c4d548d8d59df68794f1e Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Fix build against latest qtbaseMaurice Kalinowski2020-08-182-0/+2
| | | | | Change-Id: Ibeb6f1a596cb93e2c2f5dd841cd568dea9e637d8 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Change return type from QMap to QMultiMapMarcel Krems2020-08-102-2/+2
| | | | | | | | | QMultiMap no longer inherits QMap which causes the conversion to fail: error C2440: 'return': cannot convert from 'const QMultiMap<QString,QString>' to 'QMap<QString,QString>' Change-Id: Ie9c0b2588d0b0c27a81949926b36800f6f6c354c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* 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. Pick-to: 5.15 Fixes: QTBUG-85388 Change-Id: Ife6183accf46a3b47f2dc6c988e40cf8f9f24e49 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev' in qt/qtwebsocketsLiang Qi2020-07-014-10/+10
| | | | | | | | Also adapt to qtbase 45c0f45e04, Move QAlertLevel and QAlertType enums into the namespace QSsl. Change-Id: I3ddbbdaf22127fe0478ce7fac5879ed36bea0b30 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* 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 Pick-to: 5.15 Change-Id: Ic0d923b7a7fe5e3bcea0b9815be1cbe946dda186 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Doc: Update docs with cmake package informationNico Vertriest2020-06-251-0/+1
| | | | | | Task-number: QTBUG-85179 Change-Id: Id248fda5c1dd7fc2df3f030040b5b64f4af4e73c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* CMake: Regenerate projectsAlexandru Croitor2020-06-241-1/+1
| | | | | | | | | | Mostly needed for src/ project, to build websockets without checking for the textcodec feature. Amends aeeaa00fa083ac339d0770d633d22f203c504253 Change-Id: I90cd219294575c763501e47b9025e8a50017641a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-232-2/+2
| | | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I36460d504aaac08bdbb64b6c71b5ab10e062e00d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Port QtWebSockets from QTextCodec to QStringDecoderKarsten Heimrich2020-06-182-32/+14
| | | | | | Task-number: QTBUG-75665 Change-Id: I957e853aef6a4e53bf0c2a0ff4ceac80522ba00f Reviewed-by: Alex Blasche <alexander.blasche@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>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-318-12/+286
|\ | | | | | | 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-198-10/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | CMake: Regenerate projects after mergewip/cmakeAlexandru Croitor2020-03-231-0/+2
| | | | | | | | | | | | 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-2314-207/+199
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: I1608720522e974c7107f00599a9fb70f17865189
| * \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-072-8/+6
| |\ \ | | |/ | | | | | | Change-Id: Ib31d3b50e4498cdfc55b68ebc5993750b5ee7ce1
| | * 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>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-293-9/+10
| |\ \ | | |/ | | | | | | Change-Id: Ib6762714c19354c7adbf0c032d2f9995f576114f
| | * 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>
| | * 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.15' into devQt Forward Merge Bot2020-01-284-6/+6
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I7434fcdb376d1227fff3ebe28f614736e7efb395
| | * | 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>
| * | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-01-211-1/+1
| |\ \ \ | | |/ /
| | * | 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>
| * | | Use the new functions/signals introduced in QSslSocketLars Schmertmann2020-01-218-0/+122
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-68419 Change-Id: Icdc41079cb946d4316cc0ec2ae40522e6de52725 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
View Lorry Controller Status