| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Remove old, unnecessary license files
Task-number: QTBUG-57147
Change-Id: I778fe2a45983f28413a41480d2f72e04fb228820
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
| |
Change-Id: Ie970ce470672f1c849470b0eaf7fe39758341e37
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After emitting urlChanged(), setUrl() did a manual open(url) if it had
a web-socket to do it on, omitting various checks that open() imposes
on actually calling open(url); as a result, it left the web socket in
an inconsistent state if it wasn't yet active. This meant that
setting active could trigger a second open() while the web-socket was
already open(), which upset it. Replaced the hand-rolled call to
open(url) with a call to open() so as to be consistent and avoid such
problems.
Task-number: QTBUG-58278
Change-Id: Iee84f2b0d973e7fd288a14018039a665658c0040
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
|
|
|
|
|
|
|
| |
Call public QWebSocket::open(const QUrl &) instead of
QWebSocketPrivate::open(const QUrl &, bool).
Change-Id: Iab248745f37787d7e3df3d6fd668fc60ad10d220
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
|
|
|
|
|
|
| |
That's the correct place and works with C++11 attributes.
Change-Id: I7814054a102a407d876ffffd14b6a2fed3744b03
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
|
|
|
|
|
| |
Change-Id: I98ef516031e8057456d8dab6de01576d2734d8f5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
|
|\
| |
| |
| | |
Change-Id: Idcd43fba828b00cef553c3142462a4776aeeda8d
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Those platforms do not support console applications with the public SDK.
Change-Id: I8993882c04c5a4b539f297d13ae09ce9ae8e9463
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Aleksey Lysenko <lysenkoalexmail@gmail.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Added binary compatibility file for qtwebsockets
Change-Id: Ia5c70c8f15fba7bd09c40d2bafe95802cb52a6c7
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
| |\
| | |
| | |
| | | |
Change-Id: I329897d416849db4bf230068003d4c36e77981c8
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I976ef33543f560891837c6a59b9ef3e33021c1f6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The qwebsocketprotocol.h header does not declare any class, but only a
namespace. This patch updates sync.profile by declaring 'classnames'
with QWebSocketProtocol explicitly.
Task-number: QTBUG-58651
Change-Id: I759b34c227b3d6ca970bcff08c6fdcbafb958c9e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This method allows a listening port to process connections with
different protocols. It lets the websocket server handle a TCP
socket, upgrading it to a websocket
[ChangeLog][QWebSocketServer] Add support to handle external QTcpSocket
Done-with: André Klitzing <aklitzing@gmail.com>
Task-number: QTBUG-54276
Change-Id: Ia36b481dc87d6f3806e9f1e61e75e528640f1937
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: If50b73b1f1e293269404bd8b38088119a0f59f1f
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use QUrl::setAuthority() to parse host and port.
The request is invalid when having username or password in Host.
Task-number: QTBUG-57357
Change-Id: I4e7c0370794dce15359d372a1e36dc0383083204
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In QWebSocketDataProcessor::process() the signals text(binary)MessageReceived
are emitted before clear() method. If signal handler blocks loop
(for example, using QDialog::exec()), clear() will be called only after
resuming loop. It may lead to the data corruption due to the fact that
QWebSocketDataProcessor clearing won't be performed before the new data
arrived.
Task-number: QTBUG-55506
Change-Id: Ib7016a91d3987dec7c1af977b17f86a53568c413
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| | |
| | |
| | |
| | | |
Change-Id: Ia8d1d059f2b8af4ec04e9abe8baa8ad150784e41
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Websocket server always constructed QWebSocketHandshakeRequest like for
non-secure socket without checking SecureMode. This led to the fact that
secure socket had "ws" scheme.
Task-number: QTBUG-55927
Change-Id: I881766f55182136072fd23f3fefe93ea60f3d27d
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Value of NonSecureMode enumerator depends on QT_NO_SSL. If Qt is built with
QT_NO_SSL defined, NonSecureMode is equal to 0, otherwise it is equal to 1.
It may lead to problem if user built app with libs where NonSecureMode = 0,
but run it with libs where NonSecureMode = 1.
[ChangeLog][QWebSocketServer] SslMode::NonSecure enumerator now always has
the same value (1) regardless of SSL enabled or disabled.
Task-number: QTBUG-56129
Change-Id: If17137eff4b19015697c827a985ef89dd95a5611
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Method onSocketDisconnected has never been called, so WebSocketServer did not
handle closed connection properly. Moreover, socket was not freed in time
and this led to increase in memory consumption
Task-number: QTBUG-56414
Change-Id: Ib57f5b88413ffeef4f296a260245ba0a8d25adb2
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| |/
| |
| |
| |
| |
| | |
Task-number: QTBUG-57523
Change-Id: I2c7f6c2467ba615d1bcbb9d659e27bb242373710
Reviewed-by: Martin Smith <martin.smith@qt.io>
|
| |\
| | |
| | |
| | | |
Change-Id: Ia8c2930d5bf681227cef0730cdf0dca6d068722f
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: I5e33e714227a277178c5d69c3a06003f58e2050a
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the CI obtains them from the qt5 super repo nowadays.
Change-Id: I127063ac69995e8084b7fd0caf25f253270b7195
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
BC file added for QtWebSockets module
Change-Id: I94fdae9d83003ebe17a2799794047ee095880205
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
| | |\ \
| | | |/
| | | |
| | | | |
Change-Id: I95f1e6fd6e9033e27bcf618e1eb50cd011ac5c4b
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added the generated data files for the binary compatibility tests
for QtWebSockets for Qt 5.6
Change-Id: I2fce98cac5eec3dbf6192782ea419653ea5f3db2
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
| | |\ \
| | | |/
| | | |
| | | | |
Change-Id: I912302259dc84aa15ca8bb8a498c5c5b148c2864
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I4c9f3a50c24f945c0f14010a10ff808d8adf7845
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-57288
Change-Id: I45978f7c267c8c8742b0cba5bc9469535e2e6f5b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/websockets/qwebsocket_p.cpp
Change-Id: Ib6b9655985246c9ce3968f1eb662be457465a937
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Required to be able to continue to compile this module
with the modularized configure
Change-Id: I9c929a1ab8e856922bacb92ca17c8e1588fa591b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I200f72423f13b54c636e995b120a70968b0e0758
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader
is strict about requiring the correct interface id, to avoid loading
unrelated plugins in the loader thread (which they may not be prepared
to do).
Change-Id: If892bc1d3d1762ffd9dad9dd19deda84baba4159
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ic90945832bc473463a2e8151df619b4fe79147ef
|
|/ / /
| | |
| | |
| | |
| | | |
Change-Id: I08541a4162ceb4ba101ed44d65143dda6eb84e3d
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use the newer qtConfig() method instead.
Change-Id: I197dbe01edaf8696ee06d30400bd18e53cf69c94
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I593c47e7aeebb7997f42a7408a8d22704d2713a1
|
| |\ \
| | |/
| | |
| | | |
Change-Id: Ie37e1ec038e82c845066f92e5f87e355d627e2ff
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QAbstractSocket::atEnd does not check actual connection state it
only checks if data is ready to be read. Under some conditions
(e.g. slow network) data may not be available yet but it doesn't
mean the server dropped connection. When more data comes FSM will
pick it up and handle as expected. The right way to check disconnect
is to check for actual socket state.
Task-number: QTBUG-51069
Change-Id: I17d7110fbefdba2d5378a71935ab5923f8c1bf3e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771
Change-Id: Ib20a0dc7d6e5c0d1ed906af5156d7d9a03e7a121
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qtwebsockets-index.html is the entry point for both C++ and QML API.
Change-Id: I81efb2d7b931cce0d63efc2f25ce89904abcbfad
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
| | |
| | |
| | |
| | | |
Change-Id: I9cb90aca8c03c569d469f25b6722c65475c510fe
|
| |\ \
| | | |
| | | |
| | | | |
Change-Id: I067bed686680780e66e526e7e578adf912aaacce
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ia4cd6851038db8c7b983f6f270381a2bce6a3312
Task-number: QTBUG-53913
Reviewed-by: Sami Makkonen <sami.makkonen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
[ChangeLog][QWebSocket] It is now possible to use TLS PSK ciphersuites.
Change-Id: I9e96669494cec5e6a4e076fe9f10fcd4ef6358a4
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ied0b921fb5bc666f0cec7c722880f1c91e1c6923
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: Ic4a2b48535dd9b22a950b84de4bfa2728a859902
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I80cd189fc82481fdc2241db6d2a7d95537c340a6
|
| | |
| | |
| | |
| | | |
Change-Id: Ibaed49134295c769c9c24f455edadce0434964aa
|