| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
+ 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
Pick-to: dev 5.15
Change-Id: Ic06040456cabc0bfce21abc09eb63d552ec04bb0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
| |
Binary compatibility file added.
Change-Id: I985f7f43ca3231f47633b9cc7190068586fc50e5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
| |
Change-Id: Idaa694be6cb667661fe4b84f8300fe758be1d5d2
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: Icb6342e997801517178f53c158c7b7fa05d3c718
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
+ 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>
|
| |\
| |/
|/|
| | |
Change-Id: I0ffba653f33728729b5feac6544263bb351fdc34
|
|\ \
| |/
|/|
| | |
Change-Id: Id8cc7b3a41321abda275e7ac7ea0a9dab3862320
|
| |\
| | |
| | |
| | | |
Change-Id: Ibffb68ca8beb6007f68baf9d1cc39201ff762840
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
+ 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>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-82605
Change-Id: Ibaa722ae26a71680426cecc3a0e25acc72d9527b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
In case it's causing these recent failures.
Change-Id: Icdedab57e2e46d332bf1ae9c1d4869a2ed480d94
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 938ad6373415fa8b0767a987c37ce51ec546859f.
Reason for revert: Was undeprecated and replacement removed
Change-Id: I79d6e931d72ec518a43fe058e1067b3754f6cf05
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
... 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>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-82253
Change-Id: I90199c05f683df18dffe796227fc8e4c0ef9f72d
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I69ac9d8a828ba664e38b1f5abdfd0830f55c134e
|
| |
| |
| |
| |
| | |
Change-Id: I2e1f4893b1b4c1270630101c390b937611e5d5e2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| | |
Fixes: QTBUG-69425
Change-Id: I28e03da927c7a9b1cbfb91a0aca32866c2e653ea
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I2bae5688cc62bffed1cfccc45e7129cf00a769f8
|
| |
| |
| |
| | |
Change-Id: Ibcb0063877543a2cb09ded212e0940fb45280c71
|
|\ \
| |/
| |
| | |
Change-Id: Iff98ea3277da7e35af6567680d0b84755e30e1af
|
| |\
| | |
| | |
| | | |
Change-Id: I84594b23a2703886e96e73758c26f4cecc1370d0
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
+ 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>
|
| |
| |
| |
| |
| |
| |
| | |
Because insertMulti is deprecated
Change-Id: I3965ea7159b2516b35c45072115eba1ab621b89a
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I422a2498bb940f801484d3f2e6e5d59edd637514
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Use 'socketError' instead.
Task-number: QTBUG-80369
Change-Id: I30527721677be0fc0f71ca33b08f608472bc8b71
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ic89c6250fae297177b4990de302b4bde71709216
|
| |
| |
| |
| | |
Change-Id: I486dace1520c7fc06e6233da8d1e0a52c7869cdb
|
| |
| |
| |
| |
| |
| |
| | |
BC file built against 5.14.0 added.
Change-Id: Ib72e1fd443bf88cec944ab451edcc43ca070a135
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: Icd1a2fd565d5d85ac6d1378578a92dbb1a9692ce
|
| |
| |
| |
| |
| | |
Change-Id: I671d93ccd766fed4fff797930804ab748cbb27a1
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
| |\
| | |
| | |
| | | |
Change-Id: I3445dc11f83f37a784867762691b372df47ff938
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic759bffc47f236217fde5db2c33260577366efc1
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-70691
Change-Id: I54b9f7157e5830b9efd8bae7d4777218857249b1
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: I9b0aaaa5d918a28bdd388e3c1988e0bc804255db
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/
| |
| | |
Change-Id: I590fe7a055b7246923d75dcce0f41075a44b0892
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: Ic8cd4116fcfa47f7457d8a630274d6745723c858
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
+ 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>
|
| | |
| | |
| | |
| | | |
Change-Id: I80b008b3cc1cf483656096bade145f05917defb5
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: I56626d23b09e833c162cacac6386c712d67236ec
|