summaryrefslogtreecommitdiff
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* Fixed a crash when destroying the QWebSocketServerv5.4.25.4.2Kimmo Karvinen2015-04-081-0/+34
| | | | | | | | | | | | 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>
* fix the port in Host field in handshake requestLiang Qi2015-02-201-0/+22
| | | | | | | Task-number: QTBUG-39355 Change-Id: I06993193fe9618ace93552aed573a3eee5de18fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use old-style SIGNAL and SLOT macros in tst_qwebsocket.cppDmitry Shachnev2015-01-261-9/+5
| | | | | | | | | | | 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>
* QWebSocket should remember close code and reasonv5.4.15.4.1Frederik Gladhorn2014-12-291-0/+5
| | | | | | Task-number: QTBUG-42982 Change-Id: I50dbff96d7d64a5213e6ea6ba7bb9429b21b1fb2 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Oswald Buddenhagen2014-11-033-0/+135
|\ | | | | | | Change-Id: I0e89ede5ea173f2e831c42d250ddb2b21b42b89b
| * Fix invalid Date header field in handshake response5.3Joni Poikelin2014-11-033-0/+135
| | | | | | | | | | | | | | | | | | 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>
| * Compile fix without proxy supportMaurice Kalinowski2014-11-031-0/+4
| | | | | | | | | | | | | | | | 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)
* | Fix QWebSocketServer for clients preferring lowercase http headers.Jorma Tähtinen2014-09-091-5/+5
| | | | | | | | | | | | | | | | | | 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>
* | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-248-144/+80
| | | | | | | | | | | | | | - Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21 Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Compile fix without proxy supportMaurice Kalinowski2014-07-071-0/+4
| | | | | | | | | | Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-261-0/+18
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2
| * Fix a typo in proxy handling.Jędrzej Nowacki2014-06-251-0/+18
| | | | | | | | | | | | Change-Id: I25c9b9be2c780dae32e3f634f58e44be303a4b23 Task-number: QTBUG-39568 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Add a QUrl serverUrl method to QWebSocketServer.Milian Wolff2014-06-081-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-111-3/+3
|\ \ | |/ | | | | Change-Id: Iff68a7da2065b64579032f1be8eaf5fb097d58bb
| * Use the proper protocol namesSze Howe Koh2014-04-091-3/+3
| | | | | | | | | | | | | | | | - "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>
* | Remove unused variableKurt Pattyn2014-03-181-1/+0
|/ | | | | Change-Id: I534878275ea39a28f684c3edac414d647743da69 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix unit testsKurt Pattyn2014-03-121-1/+1
| | | | | Change-Id: I24091b8b976b30e8d6ef26f41530027339106243 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Return correct error string for known socket errorsKurt Pattyn2014-03-121-6/+36
| | | | | | Task-number: QTBUG-37228 Change-Id: I246b858694ea456bce9a0fc4ac963a83502fd058 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Prefer to use normalised signal/slot signaturesSergio Ahumada2014-03-011-4/+4
| | | | | | Change-Id: I92322fc3404795bea8442b9b849564d5cd39b367 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename websockets.pro -> qtwebsockets.proSergio Ahumada2014-02-163-6/+17
| | | | | Change-Id: Ia42316304a37d151b678a9922071bbb090ec87b5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Adapt copyright headerKurt Pattyn2014-02-158-8/+8
| | | | | Change-Id: I9773492d3673d8aabdb4dd178be6af12eca7ba74 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add user configurable mask generationKurt Pattyn2014-02-153-1/+174
| | | | | | | | | 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-0/+216
| | | | | | Task-number: QTBUG-36762 Change-Id: I239bdd06252fb90056a687ace8540bb91b0055a1 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Check on newline characters in origin and urlsKurt Pattyn2014-02-111-5/+107
| | | | | | | | | | 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>
* Remove superfluous argumentKurt Pattyn2014-02-091-1/+1
| | | | | Change-Id: I7fa01d47d66411572f3f66f4ed5d8df04ac6b8b0 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Fix tst_QWebSocket::tst_invalidOpen for catch-all DNS setups.Milian Wolff2014-02-061-5/+5
| | | | | | | | | | | | Instead of relying on a hostname which might still be resolved in some DNS setups (i.e. always forward to google search or intranet), we now try to connect to localhost port 1 which should yield a ConnectionRefusedError. This way, the test passes for me on my setup. Change-Id: I025824796e94e718a42c4999706f647a72b37659 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Fix compilation of websocketprotocol test.Milian Wolff2014-02-061-0/+1
| | | | | | | | The versionFromString method must be exported for usage in the test. Additionally, the metatype of the version enum must be declared. Change-Id: I8e0aef28f9902f274cab43f772667ad5a93c4062 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add unit tests for QWebSocketServerKurt Pattyn2014-02-023-1/+374
| | | | | Change-Id: I9ca38aad22a757437943a72669b7ca2bb5db6b98 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add unit tests for QWebSocketKurt Pattyn2014-02-023-0/+242
| | | | | | | Added basic unit tests for QWebSocket. Connectivity is not tested yet. Change-Id: I38d388d289733777e6ff0253e5b201aca99b0b10 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Move versionFromString() from public to private APIKurt Pattyn2014-02-011-1/+76
| | | | | | | | This method is only necessary for processing of handshakes and hence is not needed in the public API. Change-Id: I6bb2327337600523a136fb394275c31b9819f631 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Move CORS authenticator test to non-private testsKurt Pattyn2014-02-014-34/+26
| | | | | | | | QWebSocketCorsAuthenticator is a public class and hence needs to be tested with the public API of QtWebSockets. Change-Id: If3af0744d8901f9c6c13d5fb9061ebf0a5a8d163 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Use QStringLiteral where appropriateKurt Pattyn2014-01-203-3/+3
| | | | | Change-Id: I608b555428aceafd7761a882cd4bd1fdb50d19b3 Reviewed-by: Richard J. Moore <rich@kde.org>
* Limit line length to 100 chars per lineKurt Pattyn2014-01-204-93/+200
| | | | | Change-Id: I2a91033c9882ca54c6fcf26d9eb5a3c91f9e0f7d Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename enumerations to comply with Qt styleKurt Pattyn2014-01-184-283/+327
| | | | | Change-Id: Id72fe27cec606e7f02b8e9ac1d0d763890e86a95 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use QString() instead of QStringLiteral("")Frederik Gladhorn2014-01-183-6/+6
| | | | | | | | | | And do the same for QByteArray. Instantiating the default constructor uses QArrayData::sharedNull() for the d-pointer which is the cheapest constructor in memory and instructions. Change-Id: I1ceaafbc0c0cb1ccc5690edba89ea1100f30b3cd Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Simplify handshake reading functionsFrederik Gladhorn2014-01-171-3/+3
| | | | | Change-Id: I000243e717b79972caa676ff10f68901904f28c9 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Move OpCode out of public APIKurt Pattyn2014-01-132-0/+2
| | | | | Change-Id: Ic0b34b684d6f9ca98789304ead1cf8b993422d02 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add optimizationsKurt Pattyn2013-12-234-202/+332
| | | | | Change-Id: Icd293f832e2d7a6272d4953c1994065d16222375 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add CMake unit tests for WebSocketsLaszlo Papp2013-12-232-0/+21
| | | | | Change-Id: I1e1218d42880191439ed06f82d0053b0d9642b1c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Cleanup code to comply with Qt styleKurt Pattyn2013-12-101-4/+0
| | | | | | | | | | | | | | - Correct placement of curly braces - Remove commented-out code - Remove superfluous qDebug statements - Add missing QT_BEGIN_NAMESPACE declarations - Add move semantics - Add cleanup handling to QWebSocketServerPrivate - Add error handling to handshake response, QWebSocketServerPrivate, QWebSocketServer, dataprocessor Change-Id: I0690dc2c444fd6fc0db974d1459bf41bd8c31d40 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Sanitize include directivesKurt Pattyn2013-11-063-13/+13
| | | | | Change-Id: I510e5e8f263d3ea08dd3d623b054d06b2911c6d6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Put fixed string length in test dataKurt Pattyn2013-11-031-2/+4
| | | | | Change-Id: I01e24b17656278c77de431c5df49d2bbd996ee89 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use escape sequences to make VS happyKurt Pattyn2013-11-031-1/+2
| | | | | Change-Id: I78dd73537e53ce5346b3a342c7a5d654cf9afb36 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Convert string from utf8 to make VS happyKurt Pattyn2013-11-031-1/+1
| | | | | Change-Id: I5cc2c3d0ffe237c6c0bf3f7ef37d28e08c2fd02e Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove memory access errorKurt Pattyn2013-11-031-5/+9
| | | | | Change-Id: I72d689c08b89be72e6bcb8171aa40812f3c77250 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Change masking to octet based processingKurt Pattyn2013-11-031-3/+3
| | | | | Change-Id: I1b450bf35760e8a5157cb1013f4668815640be5d Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Make mask explicitly big endianKurt Pattyn2013-11-021-4/+7
| | | | | Change-Id: I3ed5fa7322ae71d9350f4c1fa835f07117ea125e Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Make mask explicit little endianKurt Pattyn2013-11-021-4/+4
| | | | | Change-Id: I5e81ae12765010faf80caa265ab832af26a61f79 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Move non-public methods from websocketprotocol to private headerKurt Pattyn2013-11-023-4/+9
| | | | | | | Add bigendian conversion of masks to unit tests Change-Id: I3f23fb62aac1c6d06e5fafb1bd4bc47cc03765ce Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Sanitize .pro filesKurt Pattyn2013-11-025-5/+0
| | | | | | | | Remove c++11 config flag if not necessary Remove mac specific compiler settings Change-Id: If3cb4c5396f6dd5679a9fc8cf8f8a81c34ad6f4c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
View Lorry Controller Status