summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2435-630/+350
| | | | | | | - Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21 Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Fix build with non-OpenSSL SSL-enabled backendsAndrew Knight2014-08-131-1/+1
| | | | | | | | | 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>
* WinRT: Fix compiler crash (msvc2013 arm)Maurice Kalinowski2014-08-131-0/+11
| | | | | | | | | 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>
* remove some pointless noise from project filesOswald Buddenhagen2014-08-081-6/+1
| | | | | Change-Id: I69b07bfdb69ec4f9ad8c7bf0e6fc327b76113de6 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-144-5/+5
|\ | | | | | | | | | | | | Conflicts: src/imports/qmlwebsockets/qqmlwebsocket.h Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b
| * Use 0 instead of Q_NULLPTR in public headers.v5.3.25.3.2Sergio Martins2014-07-114-4/+4
| | | | | | | | | | | | | | | | 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>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I55312f10a949dc75fdfbf644631fc844afc29329 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Add initial support for a declarative WebSocketServer.Milian Wolff2014-07-027-10/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-261-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2
| * Fix a typo in proxy handling.Jędrzej Nowacki2014-06-251-1/+1
| | | | | | | | | | | | Change-Id: I25c9b9be2c780dae32e3f634f58e44be303a4b23 Task-number: QTBUG-39568 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-144-2/+8
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8ef1da19810c1bf4d68bf157848bccb5446669cc
| * Document WebSocket::sendTextMessage(string message)Richard Moe Gustavsen2014-05-231-0/+5
| | | | | | | | | | Change-Id: I38c08520c37d84570c3c8df9d2416131defc5b40 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Add missing classname for module in qmldir.v5.3.0Frederik Gladhorn2014-05-093-2/+3
| | | | | | | | | | | | | | Task-number: QTBUG-38854 Change-Id: Iad6d49309010fd9ccb7e8fcb2c58962d811f018f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Doc: Fix qmlclass selector used in documentation configTopi Reinio2014-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | Add a QUrl serverUrl method to QWebSocketServer.Milian Wolff2014-06-082-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Remove dependency on unused sql moduleFatih Aşıcı2014-05-271-1/+1
| | | | | | | | | | | | Change-Id: I102bcb81ec53d022480e81a3632b93d42bf33403 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
* | Copy the more efficient HTTP header parser from QtNetworkThiago Macieira2014-05-091-21/+46
| | | | | | | | | | | | | | | | | | | | 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>
* | Remove superfluous qWarning statementsKurt Pattyn2014-05-051-5/+0
| | | | | | | | | | Change-Id: I3a6f9881cbd19f409f6d345fde640b9899dad196 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-1110-39/+39
|\ \ | |/ | | | | Change-Id: Iff68a7da2065b64579032f1be8eaf5fb097d58bb
| * Use correct casing for WebSocketv5.3.0-rc1Kurt Pattyn2014-04-101-1/+1
| | | | | | | | | | | | Change-Id: Ifbce704186a76b57a4b557b6fc6bfda004517800 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Fix process handshake for servers preferring lowercase http headers.Jędrzej Nowacki2014-04-091-7/+7
| | | | | | | | | | | | Task-number: QTBUG-37975 Change-Id: I81225a870aa92350e959b741aec34332eb8d171e Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Use the proper protocol namesSze Howe Koh2014-04-099-29/+29
| | | | | | | | | | | | | | | | - "WebSocket" is one word, with uppercase 'W' and 'S'. - "HTTP"/"HTTPS" is fully uppercase Change-Id: Ice3a50c94394433c97f7347291af5cda69b234ce Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Fix compilation on QNXSergio Ahumada2014-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Q_DECL_NOEXCEPT to 'bool seed()' and 'quint32 nextMask()' qdefaultmaskgenerator_p.cpp:93:34: error: declaration of 'virtual bool QDefaultMaskGenerator::seed()' has a different exception specifier qdefaultmaskgenerator_p.h:69:10: error: from previous declaration 'virtual bool QDefaultMaskGenerator::seed() noexcept (true)' qdefaultmaskgenerator_p.cpp:104:41: error: declaration of 'virtual quint32 QDefaultMaskGenerator::nextMask()' has a different exception specifier qdefaultmaskgenerator_p.h:70:13: error: from previous declaration 'virtual quint32 QDefaultMaskGenerator::nextMask() noexcept (true)' Change-Id: Iae49a060fa62a33f629cadc1a0100653a12432f7 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-249-31/+34
|\ \ | |/ | | | | Change-Id: I7215c289188462383799269aa9b736ae76db4d25
| * Doc: Fix example path in documentation configv5.3.0-beta1Topi Reinio2014-03-211-1/+1
| | | | | | | | | | | | Task-number: QTBUG-37643 Change-Id: Ifce8f4016c70642a7ae344b0bab463eb201460df Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Doc: small fix in documentationKurt Pattyn2014-03-191-1/+1
| | | | | | | | | | Change-Id: If7c0e3f33c8c73695492511ff51ab58f4a7863d0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * fix compilation with QT_NO_NETWORKPROXYMaurice Kalinowski2014-03-182-1/+5
| | | | | | | | | | Change-Id: Ice7ad51cbbde0ef2459642309c32dd392463754d Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| * fix typo in macroMaurice Kalinowski2014-03-172-2/+2
| | | | | | | | | | | | Change-Id: Ib302db81e0667d0c89c1da8611639db0811ff9f3 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Doc: Language/writ. guidelines review Qt WebSocketsNico Vertriest2014-03-145-27/+24
| | | | | | | | | | | | | | Task-number: QTBUG-37149 Change-Id: Ic0c28928404fc515de40e6fdff11849cdb2929d6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Add generic thumbnails for the examplesTopi Reinio2014-03-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | As the examples do not have any images in their documentation, no thumbnails are generated. This change adds generic 'Qt Code Sample' thumbnails for the examples, ensuring that they are listed in Qt Creator's example list. Change-Id: I40d3c69e9cebad72997d82eba0758c63c146aea7 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-1312-13/+131
|\ \ | |/ | | | | Change-Id: I0ee590f834200c488498315e66acf7cd046d43ad
| * Return correct error string for known socket errorsKurt Pattyn2014-03-121-1/+1
| | | | | | | | | | | | Task-number: QTBUG-37228 Change-Id: I246b858694ea456bce9a0fc4ac963a83502fd058 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Update documentation.Kurt Pattyn2014-03-114-0/+87
| | | | | | | | | | Change-Id: I8fca0df0ea66adba0898d95f8249ea1b7f33892a Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Doc: Review documentation Qt WebSocketsNico Vertriest2014-03-112-2/+13
| | | | | | | | | | | | | | Task-number: QTBUG-37149 Change-Id: Ia8fe7b11140d31bc231a17bfcc16887f3af0dbce Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix documentation warningsKurt Pattyn2014-03-111-2/+5
| | | | | | | | | | Change-Id: I5790460aab2377144d041c5b2a75ae0208ec5c00 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Fix Google Chrome connection problemKurt Pattyn2014-03-102-4/+21
| | | | | | | | | | | | Task-number: QTBUG-36757 Change-Id: I6a802e93e28b6281fe03aacf001897003310a027 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
| * Make the constructor explicitSergio Ahumada2014-03-011-1/+1
| | | | | | | | | | Change-Id: I6dcd225de9fee909c4cd1afa70938c2eb7ff819a Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Use const & for your foreach variablesSergio Ahumada2014-03-011-1/+1
| | | | | | | | | | Change-Id: I6096111284f02f07e1e7864b8795236563d4f6c1 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Doc: Fixed missing line separators in qdocconf file.v5.3.0-alpha1Jerome Pasion2014-02-241-2/+2
| | | | | | | | | | | | | | | | | | -needed to get the documentation to build. Task-number: QTBUG-33360 Change-Id: Ifed61ebb39843936ac3e350f26f6accffda78318 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Cleanup headerKurt Pattyn2014-03-111-4/+0
|/ | | | | Change-Id: Ib81683e84192a19ca660a7413ee0fcbd69909768 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Fix non-strict warning from AutoBahnKurt Pattyn2014-02-161-2/+0
| | | | | | | | When the reserved bits were set to 3, then the connection was aborted. No a close message is sent before the connection is closed. Change-Id: Iab365a4720c6588e5c6ac73813f63d26c3312265 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename websockets.pro -> qtwebsockets.proSergio Ahumada2014-02-163-7/+11
| | | | | Change-Id: Ia42316304a37d151b678a9922071bbb090ec87b5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Adapt copyright headerKurt Pattyn2014-02-1533-33/+33
| | | | | Change-Id: I9773492d3673d8aabdb4dd178be6af12eca7ba74 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add user configurable mask generationKurt Pattyn2014-02-159-21/+379
| | | | | | | | | Created a QMaskGenerator abstract base class to serve as a basis for user specific mask generators. Added the possibility to override the default mask generation in QWebSocket. Change-Id: Iaa02b44193f854d103b5f352617789175fe61f89 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Fix multiple emission of received signalsKurt Pattyn2014-02-151-1/+1
| | | | | | Task-number: QTBUG-36762 Change-Id: I239bdd06252fb90056a687ace8540bb91b0055a1 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use queued connection for readyRead connectionKurt Pattyn2014-02-141-1/+5
| | | | | | Task-number: QTBUG-36757 Change-Id: I4358563d52ecbff7b7e1575c5d34cef30b5fcd52 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Check on newline characters in origin and urlsKurt Pattyn2014-02-113-15/+68
| | | | | | | | | | New line characters (\r\n) in the resource part of a url and in the origin string can be used to forge the http header and can lead to insertion of unwanted header entries. This can be an indication of an attack, so QWebSocket immediately refuses a connection. Change-Id: I9cdb309bfbe7025ad675925e6ea3e038476a1fd6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Re-enable QML componentKurt Pattyn2014-02-114-11/+10
| | | | | | | Change-Id: I84948cf414585af841f3e669ddaf18b7a10fb22f Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Sanitize open() methodKurt Pattyn2014-02-072-6/+3
| | | | | | | | | Removed the mask parameter because a web socket client does not have a choice between masking and not masking. Change-Id: I3c33acc235bb2a99476abb6201e6dbb6f881dd70 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Connect sslErrors signal when a secure connection is establishedKurt Pattyn2014-02-071-0/+4
| | | | | | Task-number: QTBUG-36676 Change-Id: Ia93751e5a972adf6434b0d749376e2a8c0619514 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
View Lorry Controller Status