| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
Lifetime of incoming QTcpSocket/QSslSocket are managed by the
QTcpServer/QSslServer and thus the QWebSocketPrivate should clear the
pointer to the socket when the socket is destroyed.
Added auto test for the crash.
Task-number: QTBUG-45331
Change-Id: I6e30e7cdcca22aa810ccc1a1d4d7d77c7cb2c349
Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I2e5c35586c3cdc153abf9a70ee1ed6bba7894ecb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-42298
Change-Id: I4c01052823ce48b737d30ac2e0ef11836124bc4f
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Neil Williams
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-44491
Change-Id: Iec007ff83414d333d10609882b11ab4fd485345a
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
|
|
|
|
|
|
|
| |
Otherwise it's just a onetime server.
Change-Id: Ida516614e72cac1635062a04a6f1f9e1c56753da
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
|
|
|
|
|
|
|
| |
Change-Id: Iadba1c5cb7cd4454b01a98339c2225483b08e180
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-39355
Change-Id: I06993193fe9618ace93552aed573a3eee5de18fa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
|
|
|
|
|
|
|
|
|
| |
In RFC 6455(v13), the correct keyword is Origin.
Task-number: QTBUG-44310
Change-Id: I009f079e01e213eb232b0dfc1a441305f3d9e588
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I9bec2324b666c00212135ef6c9d5a69594cda050
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: Ib38445f8bf67e3bfe81f5d2d1a30f7b429f30ac5
Task-number: QTBUG-43810
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|
|
|
|
| |
Change-Id: I7e2adaf19d15842f914be6f946f30d09b7b5532f
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-38740
Change-Id: If8df86990686af6811ad3bb21f93448ced946b6c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Without that, this test is failing on some architectures.
Task-number: QTBUG-43804
Done-with: Helge Deller <deller@gmx.de>
Change-Id: I7d275ca6d0baa70e504bbb4a31c65c2ed65d2118
Reviewed-by: Helge Deller <deller@gmx.de>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
|
|
|
|
| |
Change-Id: I75234391355c74e61c032d1b338587408e9034d3
|
|
|
|
|
|
| |
Task-number: QTBUG-42982
Change-Id: I50dbff96d7d64a5213e6ea6ba7bb9429b21b1fb2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
|
|
|
|
| |
Change-Id: I5b6f91f66cd5e9379f411952bce59c0364e2065c
|
|
|
|
|
|
|
|
|
| |
This allows the plugins.qmltypes file to be updated by just running
make qmltypes
Change-Id: I0872082645e9d4d8879e3a3479aea80494248894
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After moving the websocket server into another thread
current code doesn't work because then the QTcpServer/QSslServer
objects reside in a different thread:
"QWarning: QObject: Cannot create children for a parent that is in a different thread."
QObject::moveToThread(QThread*) also moves QObjects's children, therefore the
internal server objects need to be children of QWebSocketServer.
Change-Id: Ic7e8a564cd87400a4ab7258e3799157ed359c098
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|\
| |
| |
| | |
Change-Id: I0e89ede5ea173f2e831c42d250ddb2b21b42b89b
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix invalid Date header in handshake response on systems with non-
english system locale.
Task-number: QTBUG-40866
Change-Id: If6d5cc55e879eff259698e87c9cda753990245e7
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Otherwise all code that calls it has to handle the other connections
separately, which is error-prone and has actually been forgotten for the
case where the QWebSocket is created via upgradeFrom().
Task-number: QTBUG-39551
Change-Id: I4d1e4faa1594b53e7a8dccc9ce13ef2c323b1c61
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This is required for for the autotests to compile.
Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
(cherry picked from commit aef4cba4ce5f3acfa6765c71283d9363dffe97b7)
|
| |
| |
| |
| |
| |
| |
| |
| | |
The signal bytesWritten(qint64) is part of the public API
and should be emitted. Seems it was just forgotten.
Change-Id: I85a56c22581c6bd3ecc504add34aeeabc76f4d2a
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
I forgot to do this when I introduced the QQmlWebSocketServer.
Change-Id: I7fd7354cf42f633973e0da71d854594627e2fb97
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1.) The websocket qml types page is now hooked into Qt's QML Type by Module
page.
2.) Correct incorrectly documented import statement for Qt.WebSockets
module in QML.
3.) Add missing \since tags (see QTBUG-36775).
Change-Id: I1321db70215fcd16cfbd77dd71a459244241d8a3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ib38d0c86aa010b06b9a201115dfbc9f091abeb0e
|
| |
| |
| |
| | |
Change-Id: I7da486fc6640df27695971c70bbb50a842b9cca2
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QWebSocketServer should not use case-sensitive compare to validate
http headers for incoming connections.
Change-Id: Ie7b8a9f6ca1a0b547eb7a924f6392395f812b0e3
Task-number: QTBUG-40615
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
- Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21
Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Qt 5.4 introduced the ability to split out the OpenSSL-specific parts
of SSL, so allow users of this configuration to still build the SSL
server.
Change-Id: I03e446c1c0fa4062afe16e58d1b7a80373da12a6
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Visual Studio 2013 Update 3 ARM compiler has issues with the code path
trying to optimize it. Instead of disabling optimization in general,
use a pragma for the function. x86 compilation is fine though.
Change-Id: If099f7d1400cb78958d10c2fd35daef3bb75fc91
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I69b07bfdb69ec4f9ad8c7bf0e6fc327b76113de6
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
that's been deprecated since the 5.0 release or so.
Change-Id: Icbb9f375261a79b708cce4b6e2a70f71140de1d4
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/imports/qmlwebsockets/qqmlwebsocket.h
Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b
|
| |
| |
| |
| |
| |
| |
| |
| | |
Otherwise Q_NULLPTR appears in documentation, which is inconsistent.
Change-Id: I0f4b07b25c6012d502938aa452e68c75d910f954
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
-url inherited from the url variable set in qtbase/doc/global
Change-Id: I55312f10a949dc75fdfbf644631fc844afc29329
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It comes with basic support for setting up a non-secure server
listening on an arbitrary host and port. The name can be set,
and whether the server should be listening or accept connections.
The error string is also available via a property.
When a client connects, a clientConnected(QQmlWebSocket*) signal is
emitted.
To showcase the usage and functionality, a new qmlwebsocketserver
example is added which behaves similar to qmlwebsocketclient. It
simply sends messages from a WebSocket to a local WebSocketServer
which in turn sends a simple response.
Change-Id: Ib6318155ed08cbeea47d820b709764d2e36dcc45
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2
|
| |
| |
| |
| |
| |
| | |
Change-Id: I25c9b9be2c780dae32e3f634f58e44be303a4b23
Task-number: QTBUG-39568
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
|
| |
| |
| |
| | |
Change-Id: I509b98fb944d007cc1e2727e5b6fa8661767c1a6
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I8ef1da19810c1bf4d68bf157848bccb5446669cc
|
| |
| |
| |
| |
| | |
Change-Id: I1eff9112ed777d873961854b3f81a00d34cb3e1f
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I38c08520c37d84570c3c8df9d2416131defc5b40
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
|
| |\
| | |
| | |
| | | |
Change-Id: I9de811ee1f43381b6ce27acd47a126a70fd10d46
|
| |/
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-38854
Change-Id: Iad6d49309010fd9ccb7e8fcb2c58962d811f018f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A recent change (46959875) in qdoc raised QML types from
subnodes to top-level nodes. This change modifies the
documentation configuration file(s) accordingly.
Change-Id: I558f00483b4f2efaa12c94066e309f46ea6e9b42
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It is useful in many places, esp. when constructing clients that
should connect to the server we created.
Note that the returned host address will be LocalHost instead of Any,
to make sure clients can connect to the server even on Windows.
This should hopefully resolve the CI issues.
Change-Id: I3c400ad4d785ea398cf1a1bd113c0833fda9e3bd
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I102bcb81ec53d022480e81a3632b93d42bf33403
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The one from QtNetwork is more efficient, since it doesn't use regular
expressions. This also solves a use of uninitialised variables.
error: ‘httpStatusCode’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
Change-Id: Id7f203d971564651eb0bd63d3d54d074be947793
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
|