| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit bfa705a7a20576405e77be28d185c84f96c1acd0 recently modified the
link to the "Talking to Yourself for Fun and Profit" paper.
While the new location for the `\externalpage` link is correct, it was
erroneously introduced with a typo in it.
In particular, `fd` was introduced in front of the `org` domain such
that the link was incorrect.
The typo is now removed such as to correct the link.
Task-number: QTBUG-96127
Change-Id: Ie4d169a978767b77f6d59b2ef135b3a3a8a0131d
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 3e855cde66a60f57eb7b307c6e6760d58f208397)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The `\externalpage` link to the "Talking to Yourself for Fun and Profit"
paper, presented at the Web 2.0 Security and Privacy 2011 conference,
pointed to the version hosted on the `w2spconf` domain, which is not
available anymore.
To repair the broken link, it was changed to point to an equivalent
version stored on the `ieee-security` site.
Task-number: QTBUG-96127
Change-Id: Id68c5947fa285062fa69a35fa9641e88118448ba
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit bfa705a7a20576405e77be28d185c84f96c1acd0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Change-Id: I0b937c9dbfaec0cd4b2aad5bd55fc731d073ca16
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 780d19f709e5be8db8fce96afab248ebbc4911eb)
|
|
|
|
|
|
|
|
|
|
|
| |
* Rename a file included by QDoc to have the correct extension
* Add missing \a command to mark a function argument
Fixes: QTBUG-96287
Change-Id: I9724b67f641ba634c91a74e3e05821f1edfeb4ad
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
(cherry picked from commit 742ba2c5172a306a2c584da90ba7f7aa9c0c1317)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Only the removal of the deprecated API.
Fixes: QTBUG-94932
Change-Id: Ib7de6b11701d4f39273eb33e75e1cc8fe2deeae3
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit f9cd291d9713fa67969a6f20738efdc624a2c0c5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
These were introduced in Qt5 as transitional methods, and deprecating
the main methods. They should still be here to support API conversion.
Change-Id: I251c97dca527971bf966335288855aeea10572d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit ddbddd249e0df85a35054ea9bdb88451e9f35fb1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Note that, in contrast to QWebSocket, QWebSocketServer misses
the continueInterruptedHandshake() method.
Change-Id: I6d38fa5a814732da40b1941decbe5cd7492bc39f
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 97a063f3f4887fc397d2819baa5a3ea8c4cf837f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Add a basic changes page for consistency with other modules.
Task-number: QTBUG-94932
Change-Id: I21428ba4bef08b4a9b50386d03c391d13f5545d0
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit f252d28b9130bcc3b9bd2e72a4357326b0216ca4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Qt 6.2 will be first Qt 6 release for Qt WebSockets
Change-Id: I2141785c3f5bf6604418e3d1b8d8c311c916400d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 90331f7a248ce3da1947ca9ba671ca4958573264)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The pro2cmake.py conversion script faithfully reproduced the .pro files
for the plugins, which specified the libraries as public. But in CMake,
the implications of this are that public usage requirements should then
be propagated to consumers. We don't expect any consumers, since a
plugin is created as a MODULE library in CMake, so for Windows we don't
even have an import library to link with. The only exception to this is
for static builds where plugins are created as STATIC libraries
instead, but only in certain controlled situations do we then link to
plugins. Even then, usage requirements are not expected to propagate to
the consumers, so these relationships should always be specified as
private.
Task-number: QTBUG-90819
Change-Id: I8a7cc92826709267cc44b210c64fb3940ea20eee
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit caa85ce2f1bb90c98d2096231b8f6eedf978c64a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
[ChangeLog] Clear frame before emitting signals to prevent duplicating messages
Fixes: QTBUG-87279
Change-Id: Iab296f443943eeec3b2a0fbb4f79c5abb2605ca7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit d196801706821a890bda8b22508c2957a50eff25)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
Switching to std::unique_ptr since we move the data, and mark move
operators noexcept.
Change-Id: I8548a0a2b07cb5108823a081dd1ea68e4bb1800d
Reviewed-by: Øystein Heskestad <oystein.heskestad@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
(cherry picked from commit 53d0cbea2bb1e274876e11cb0c56b414623cfc2a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Do a purely syntactical conversion that leaves all the old code intact.
Porting to declarative type registration etc shall be done in a separate
step.
Change-Id: I8322efe8160f2d6761817cb89d5369b15a63a952
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Pick-to: 5.15
Change-Id: Ic74407b17d03fbfd3077ac1dd4f689a7207ccb51
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
| |
Change-Id: Iaaa4a44c8cf8735aa17293540e701ababace8155
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|
|
|
|
| |
Change-Id: Ifecb6f90687601a20e719db3ba194e33f3303f24
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
| |
Change-Id: Iab7b0c45ef3e5c8c042aa906f5eb4d9142b0f6d9
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I2f5660c165dbdc504c66ec8d04ab97c349b197fd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
| |
Change-Id: I3f34797df1fbf25be03c4d548d8d59df68794f1e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|
|
|
|
| |
Change-Id: Ibeb6f1a596cb93e2c2f5dd841cd568dea9e637d8
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Task-number: QTBUG-85179
Change-Id: Id248fda5c1dd7fc2df3f030040b5b64f4af4e73c
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Task-number: QTBUG-75665
Change-Id: I957e853aef6a4e53bf0c2a0ff4ceac80522ba00f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
| |
Change-Id: Ife1899ec8516a7d8b790c2321b6cd61e57772eec
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: I7b3d96575073eb6537b40286c027074969bf8076
|
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I3cdf755e3aae933016b9719ce4c61f53e554ea48
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
dependencies.yaml
Change-Id: I1608720522e974c7107f00599a9fb70f17865189
|
| |\ \
| | |/
| | |
| | | |
Change-Id: Ib31d3b50e4498cdfc55b68ebc5993750b5ee7ce1
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: Ib6762714c19354c7adbf0c032d2f9995f576114f
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| |\ \ \
| | |/ /
| | | |
| | | | |
Change-Id: I7434fcdb376d1227fff3ebe28f614736e7efb395
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Because insertMulti is deprecated
Change-Id: I3965ea7159b2516b35c45072115eba1ab621b89a
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| |\ \ \
| | |/ / |
|