summaryrefslogtreecommitdiff
path: root/src/websockets
Commit message (Collapse)AuthorAgeFilesLines
* Update documentationKurt Pattyn2014-01-131-0/+27
| | | | | Change-Id: I98cab390cbb0f19741d6fa4ae5b0ada8d19d1f5f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use new connect syntaxKurt Pattyn2014-01-132-15/+18
| | | | | 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-113-5/+14
| | | | | 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-271-3/+13
| | | | | 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-2312-150/+171
| | | | | Change-Id: Icd293f832e2d7a6272d4953c1994065d16222375 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-226-14/+85
| | | | | 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>
* Cleanup code to comply with Qt styleKurt Pattyn2013-12-1017-742/+659
| | | | | | | | | | | | | | - 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>
* 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-182-14/+22
| | | | | Change-Id: I1c7059a8e581ce5179c00f187b03f59fbed63ba6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add close code and close reason getter functionsKurt Pattyn2013-11-174-0/+46
| | | | | 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 sslEchoClient and sslEchoServer examplesKurt Pattyn2013-11-069-13/+318
| | | | | | | Add license headers Change-Id: Ied74cb3db6ceed6c3f361e4afac860a7a3fb7676 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Sanitize include directivesKurt Pattyn2013-11-0619-64/+73
| | | | | Change-Id: I510e5e8f263d3ea08dd3d623b054d06b2911c6d6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add QtWebSockets/ directory to include to remove compiler warningKurt Pattyn2013-11-041-1/+1
| | | | | | | | Ubuntu qtlibinfix build generates a warning that qwbsockets_global.h should be prefixed with QtWebSockets/ Change-Id: I3de7e359e5c0d856ca8c4486abb3fe745ab7d2cd Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add QWebSocketConfiguration to pre-cache socket settingsKurt Pattyn2013-11-043-72/+108
| | | | | Change-Id: Ibff22b277b89379dc31b0b7a8a02547e12bff58e Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove memory access errorKurt Pattyn2013-11-031-18/+0
| | | | | Change-Id: I72d689c08b89be72e6bcb8171aa40812f3c77250 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Change masking to octet based processingKurt Pattyn2013-11-034-4/+18
| | | | | Change-Id: I1b450bf35760e8a5157cb1013f4668815640be5d Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use alignment on 4-byte boundary for masking inputKurt Pattyn2013-11-032-2/+2
| | | | | Change-Id: I8efea21179245e8d8ed8095c327aef69676e2e1a Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Improve speed of maskingKurt Pattyn2013-11-031-9/+10
| | | | | Change-Id: Ieb1b28ac2ae37453da5b365587b8ab0e183ae269 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Correct castKurt Pattyn2013-11-021-2/+2
| | | | | Change-Id: Ic87115f738ec50fbf7d63a5483dd25b1e451348b Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Move non-public methods from websocketprotocol to private headerKurt Pattyn2013-11-027-20/+81
| | | | | | | Add bigendian conversion of masks to unit tests Change-Id: I3f23fb62aac1c6d06e5fafb1bd4bc47cc03765ce Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Sanitize .pro filesKurt Pattyn2013-11-021-1/+1
| | | | | | | | Remove c++11 config flag if not necessary Remove mac specific compiler settings Change-Id: If3cb4c5396f6dd5679a9fc8cf8f8a81c34ad6f4c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use export keyword in front of << operatorKurt Pattyn2013-11-022-2/+4
| | | | | | | VS is very picky regarding the placement of the export keyword. Change-Id: Ibde3de8e36e57bea854d6d6ff001259b4b0d8e7e Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Include functional for std::greaterKurt Pattyn2013-11-022-0/+2
| | | | | | | Without this include, it does not compile on VS2012 Change-Id: I2400c789cbf11440dc8deea5d7b841f1122064f8 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Move Q_AUTOTEST_EXPORT in front of streaming operatorKurt Pattyn2013-11-022-2/+2
| | | | | Change-Id: I24d336e960038dea235b371449b5a25ca86a7c93 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add null pointer checksKurt Pattyn2013-11-011-167/+274
| | | | | Change-Id: I3582e4ebc6aa275a10dd03b9189cafdc72dc236f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Replace qGreater with std::greaterKurt Pattyn2013-11-013-4/+4
| | | | | Change-Id: I1c2e2f14bbbd1dfc8dc30d4a0cdff7ded0222113 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Close namespace at end of fileKurt Pattyn2013-11-012-0/+4
| | | | | Change-Id: Idc899e8081e31c3ba93893dc23abd89b4691f6e7 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add correct license headersKurt Pattyn2013-11-0122-384/+886
| | | | | Change-Id: I789cd780697aedbca7a90a5991df00b2c7e9ec98 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Refine doc generationKurt Pattyn2013-11-019-47/+231
| | | | | Change-Id: I9da90086c63b88a5664f241da2fa9687c3882ddf Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Replace int with qintptr for socket descriptorKurt Pattyn2013-11-012-4/+4
| | | | | Change-Id: Ie554b90a62c504e3ef54fd2d36e93806f4871f81 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add functionality to ignore ssl errorsKurt Pattyn2013-11-015-5/+104
| | | | | Change-Id: I81248b9af104c0b3d37c9cfcef250a102f4b1d32 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Implement of secure web socketsKurt Pattyn2013-10-314-5/+100
| | | | | Change-Id: I1f96d5e4e327eae211fd6b458168e1f7607e2dcf Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Mark line as not relevant for code coverageKurt Pattyn2013-10-191-1/+1
| | | | | Change-Id: Id82bed1b3fa0ac0e48239894ad94b4d3778ee800 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove CXX debug flags from project fileKurt Pattyn2013-10-191-2/+0
| | | | | | | The debug flags are normally set by the Qt build environment. Change-Id: Icc61c7d5aeed7c73ac6c947d31d9eed71c02a606 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove const from return value of operator =Kurt Pattyn2013-10-192-2/+2
| | | | | Change-Id: I062756f8b337afee0b4f04bd6631d83bc560a607 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add flag to not optimize when in debug modeKurt Pattyn2013-10-191-0/+2
| | | | | Change-Id: Iefaf4f6361042b3c3e5fb9bc620228e3e9cd3cbd Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>