summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocket_p.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-301-0/+3
|\
| * Fix empty sslConfiguration in sslErrors slotAndré Klitzing2017-10-271-0/+3
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2Liang Qi2017-10-111-2/+3
|\ \ | |/
| * Change assert to null-checkMårten Nordheim2017-09-201-1/+2
| * Fix releaseConnectionsAlan Alpert2017-08-291-1/+1
* | Use multi-arg instead of multiple arg callsAndré Klitzing2017-10-091-1/+1
|/
* Replace comment with Q_FALLTHROUGHJesus Fernandez2017-05-041-3/+3
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-211-10/+6
|\
| * Eradicate Q_FOREACH and Java-style loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-071-11/+8
* | Eradicate Q_FOREACH loopsAndré Klitzing2016-08-231-1/+2
|/
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-021-1/+1
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-1/+1
| |\
| | * Fixed erroneous detection of server disconnect conditionOleksandr Tymoshenko2016-06-201-1/+1
* | | Add support for TLS PSK (client and server)André Klitzing2016-06-121-0/+3
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-081-2/+24
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-2/+24
| |\ \ | | |/
| | * Fix possible hang on handshakeKai Koehne2016-04-071-2/+5
| | * Update the QWebSocket's QSslConfiguration when neededAndy Shaw2016-03-101-0/+19
* | | Remove unused variableFrank Meerkoetter2016-04-071-3/+1
* | | Limit variable scopeFrank Meerkoetter2016-04-071-2/+1
* | | Limit function visibility to the translation unitFrank Meerkoetter2016-04-071-1/+1
|/ /
* | Updated license headersAntti Kokko2016-01-201-14/+20
|/
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-021-18/+25
|\
| * Set parent of internal socket objectsPeter Kümmel2015-09-041-18/+25
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-301-1/+5
|\ \ | |/
| * Correct the default port of secure hand shake requestLiang Qi2015-05-221-1/+5
* | Send and parse headers for the handshake requestLuca Niccoli2015-05-261-2/+21
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-111-3/+16
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-151-0/+11
| |\
| | * Fixed a crash when destroying the QWebSocketServerv5.4.25.4.2Kimmo Karvinen2015-04-081-0/+11
| * | Do not decode the HTTP resource nameLuca Niccoli2015-04-091-2/+3
| * | Always initialize m_handshakeStateLuca Niccoli2015-04-081-1/+2
* | | Add open(const QNetworkRequest &) and request()Luca Niccoli2015-04-081-13/+15
|/ /
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-251-1/+6
|\ \ | |/
| * client ping should be maskedLiang Qi2015-02-241-1/+6
* | Update copyright headersJani Heikkinen2015-02-161-6/+6
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-191-0/+2
|\ \ | |/
| * QWebSocket should remember close code and reasonv5.4.15.4.1Frederik Gladhorn2014-12-291-0/+2
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-211-9/+16
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.3' into 5.4Oswald Buddenhagen2014-11-031-9/+16
| |\
| | * Make QWebSocketPrivate::makeConnections() take care of all connections.Christian Kandeler2014-11-031-9/+16
* | | Make the websocket handshake statefullAllan Sandfeld Jensen2014-11-191-39/+69
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-201-0/+1
|\ \ \ | |/ /
| * | Also forward the bytesWritten(qint64) signalPeter Kümmel2014-10-151-0/+1
* | | Fix QWebSocket's handling of query parameters with encoded charactersJuha Turunen2014-10-111-1/+1
|/ /
* | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-241-18/+10
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-261-1/+1
|\ \ | |/
| * Fix a typo in proxy handling.Jędrzej Nowacki2014-06-251-1/+1
* | Copy the more efficient HTTP header parser from QtNetworkThiago Macieira2014-05-091-21/+46
|/
* Fix process handshake for servers preferring lowercase http headers.Jędrzej Nowacki2014-04-091-7/+7