summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use new connect syntaxKurt Pattyn2014-01-207-23/+26
| | | | | Change-Id: I0b48c6cba12902d910c4f586fa105a13d084a437 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Limit line length to 100 chars per lineKurt Pattyn2014-01-209-98/+210
| | | | | Change-Id: I2a91033c9882ca54c6fcf26d9eb5a3c91f9e0f7d Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Move currentVersion method to private namespaceKurt Pattyn2014-01-203-2/+3
| | | | | Change-Id: I49c952e8c71018fab2e48ade27f1f9c19279acb5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename enumerations to comply with Qt styleKurt Pattyn2014-01-1819-473/+523
| | | | | Change-Id: Id72fe27cec606e7f02b8e9ac1d0d763890e86a95 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add reference to related feature reportKurt Pattyn2014-01-181-0/+1
| | | | | Change-Id: Iba4aa2db5a2967865ff731134e6514d6649bcafb Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use QString() instead of QStringLiteral("")Frederik Gladhorn2014-01-185-19/+19
| | | | | | | | | | 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>
* Make single argument ctor explicitFrederik Gladhorn2014-01-181-2/+2
| | | | | Change-Id: Idf4933cb9caa0e33ee72948390d2b6d98c241fc5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* one if (m_mustMask) is enoughFrederik Gladhorn2014-01-181-4/+4
| | | | | Change-Id: I6cb89b981b70f10510319bfb51b77874e2a4d85a Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* No warnings means we can use CONFIG += warning_cleanFrederik Gladhorn2014-01-181-0/+1
| | | | | | | This will use werror to keep the module clean. Change-Id: I6229ff593d1263e30feee474636a35e87d38c4e6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add a few more const refsFrederik Gladhorn2014-01-187-24/+24
| | | | | | | | | In case of processPing we need to make a copy that potentially detaches when masking is requested, but pings are < 125 bytes. Before this code would copy the byte array in the same way much earlier. Change-Id: If0592bb4b508eeb11fdbf05c4bb98b9679ed0549 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Fix warningFrederik Gladhorn2014-01-181-1/+2
| | | | | | | | | | | warning: ignoring return value of 'qint64 QWebSocketPrivate::writeFrame(const QByteArray&)', declared with attribute warn_unused_result [-Wunused-result] For pings the result is not relevant since they are one frame only. Change-Id: Iaf958e3e1a333f8d3c0b0f9ba56f7ab58e4900f9 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Fix docs after adding const refsFrederik Gladhorn2014-01-171-5/+5
| | | | | Change-Id: I9fc1d996584c1136efca4412fe76c570cc4201ec Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Fix typo (passive requires past participle)Frederik Gladhorn2014-01-171-1/+1
| | | | | Change-Id: I3792ccb9fa40042d0a5912a3723bfbf23b867f73 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use const ref in public signalsFrederik Gladhorn2014-01-171-5/+5
| | | | | | Change-Id: I2846f668848395a820aabcc0359bcda2979bde1e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Make sure that the random generator is initialized in all code pathsFrederik Gladhorn2014-01-172-3/+12
| | | | | Change-Id: Ice4826e7670cffa791250a95387ac1121ddc4089 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Simplify handshake reading functionsFrederik Gladhorn2014-01-174-25/+12
| | | | | Change-Id: I000243e717b79972caa676ff10f68901904f28c9 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove doc reference to non-existent functionLaszlo Agocs2014-01-171-1/+0
| | | | | Change-Id: I309104e808cd6749d8f9430fcbcf170c78056730 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove _p suffix from cpp filenames.Kurt Pattyn2014-01-136-5/+5
| | | | | Change-Id: I425aa372fe2f4114939f2691f270644e66017276 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Move OpCode out of public APIKurt Pattyn2014-01-136-21/+25
| | | | | Change-Id: Ic0b34b684d6f9ca98789304ead1cf8b993422d02 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Update documentationKurt Pattyn2014-01-132-4/+33
| | | | | Change-Id: I98cab390cbb0f19741d6fa4ae5b0ada8d19d1f5f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use new connect syntaxKurt Pattyn2014-01-133-18/+25
| | | | | Change-Id: Idd002ff72d27e5b549600704ae0e857bd021f5d1 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Limit line length to 100 characters.Kurt Pattyn2014-01-1218-251/+476
| | | | | Change-Id: I9da963570b174b9a5a33e65cf144402677b4bab5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Replace emit by Q_EMITKurt Pattyn2014-01-111-4/+4
| | | | | Change-Id: I8543a74a9b3c8c1b45d9e0e12223072b6637199b Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove waitXXX() methods from websocketsKurt Pattyn2014-01-118-96/+0
| | | | | | | | | | | | | The QWebSocketServer::waitForNewConnection() was just calling QTcpServer::waitForNewConnection(), which was not correct because a connection is only complete when the handshake succeeds. Waiting for the handshake to complete would need a separate thread for the handshake handling code, which would complicate the code a lot. It was decided to leave out all waitXXX() methods from the module, as it is easier to add this functionality later, then to remove it. Change-Id: I778bae45b67f81e151ad2362f772c75e9f537ff0 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Enable docs for QWebSocketProtocolFrederik Gladhorn2014-01-112-13/+13
| | | | | | | | | | There is no advantage to haveing the cpp files have _p.cpp and as the public docs are in this file, rename it. In order to have the docs generated there needs to be a namespace page. Change-Id: Id6ef10ba39b7ea8b18d5d8e1cde03e566e682926 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Link qml documentation and make it visible in creatorFrederik Gladhorn2014-01-114-5/+15
| | | | | Change-Id: I39cd6aab1eb7dd154bc41a211984396540b6979c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Fix typoFrederik Gladhorn2014-01-111-1/+1
| | | | | Change-Id: Ie7a6724b6075ed50f30072e637780234ee7fe48c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use new connect syntax in a few placesFrederik Gladhorn2014-01-091-16/+18
| | | | | Change-Id: Iff0bd801a2dc4cce9b867e9a83320d0f9a716ab3 Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com>
* Correct whitespaceKurt Pattyn2014-01-041-9/+9
| | | | | Change-Id: I9cefb6139c41317ba2eb1453b66411132efbee6a Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Check on max pending connections before accepting a connectionKurt Pattyn2014-01-041-0/+7
| | | | | Change-Id: Ia94540e131ce424e6306886861598f7f24f7577f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add clarification in documentationKurt Pattyn2014-01-041-0/+5
| | | | | Change-Id: Ib616c4c932cb2797036d2d821af7726fcfe2f877 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Adapt to Qt coding styleKurt Pattyn2014-01-048-398/+287
| | | | | Change-Id: I137ac180b19228e0a5683e21ca87e3fe2db9f97b Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add Qml documentationKurt Pattyn2013-12-272-4/+54
| | | | | Change-Id: I38bfb0d87614fee1d508567a014a41e4be8cf6c2 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add limitation to write() methodsKurt Pattyn2013-12-272-8/+27
| | | | | Change-Id: I5e1176711885ff698b9c05034785adc9a0612ccc Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add optimizationsKurt Pattyn2013-12-2320-366/+530
| | | | | 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>
* Fix the documentation by using the qdocconf term aroundLaszlo Papp2013-12-222-2/+2
| | | | | Change-Id: I8a999c27b71e23d5090d45c900ad3c3492e43668 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add extra documentationKurt Pattyn2013-12-2214-14/+458
| | | | | Change-Id: I1a3c0571faeabf2d05bc144628d186e5ff039014 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Cleanup whitespaceKurt Pattyn2013-12-222-6/+6
| | | | | Change-Id: Iaf5501838662b5f0191c21c608149a9348ce1c05 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Fix SSL examplesKurt Pattyn2013-12-221-2/+6
| | | | | | | Only include ssl examples when ssl is enabled in Qt Change-Id: I1ab8ec068980c0b6b9f19b47d05ae8fee3d17e79 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Cleanup code to comply with Qt styleKurt Pattyn2013-12-1025-764/+685
| | | | | | | | | | | | | | - 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>
* Add QML websockets pluginKurt Pattyn2013-11-259-45/+333
| | | | | | Change-Id: I9454cf339f8af5515d3a91667d8c8ded3659d18b Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Wrap SECURE_MODE in ifdef statementsKurt Pattyn2013-11-191-0/+11
| | | | | Change-Id: Ie936ea7db14ed34fa0cb53030447bba6cbc83a4e Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Change open method so that a web socket can be reopenedKurt Pattyn2013-11-184-15/+26
| | | | | Change-Id: I1c7059a8e581ce5179c00f187b03f59fbed63ba6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add close code and close reason getter functionsKurt Pattyn2013-11-175-0/+47
| | | | | Change-Id: I4eeab1521054e4f4921d25c6a990eeb7486443cb Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Wrap ssl implementation in ifdef statementKurt Pattyn2013-11-071-0/+2
| | | | | Change-Id: I8ad6a7f29e639fd4e908acc6d3c2f8a393c72001 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add NON_SECURE_MODE parameter to QWebSocketServer constructorKurt Pattyn2013-11-071-1/+1
| | | | | Change-Id: I9e2e892b67490061f08d03b87a8dc3de288a09e5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Change url to localhostKurt Pattyn2013-11-061-2/+1
| | | | | Change-Id: I6a33add4244d78e703f1d0c8ae39d42017383b26 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add sslEchoClient and sslEchoServer examplesKurt Pattyn2013-11-0627-27/+956
| | | | | | | Add license headers Change-Id: Ied74cb3db6ceed6c3f361e4afac860a7a3fb7676 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Sanitize include directivesKurt Pattyn2013-11-0622-77/+86
| | | | | Change-Id: I510e5e8f263d3ea08dd3d623b054d06b2911c6d6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>