summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changes file for Qt 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Antti Kokko2020-04-281-0/+23
* Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-221-0/+20
|\
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ |/ /
| * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\
| | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
| |/
* | QAbstractSocket: Fix warnings from deprecated error signalv5.15.0-beta4v5.15.0-beta3Mårten Nordheim2020-03-231-2/+1
* | Add a public api to set max frame and message size (CVE-2018-21035)Franck Dude2020-03-1910-13/+374
* | Revert "Speculatively increase timeouts in tst_qwebsocket"Timur Pocheptsov2020-03-191-5/+5
* | Speculatively increase timeouts in tst_qwebsocketMårten Nordheim2020-03-181-5/+5
* | Stabilize tst_QWebSocketServer::tst_handshakeTimeoutv5.15.0-beta2Mårten Nordheim2020-03-101-1/+6
* | Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-022-8/+6
* | Revert "QWebSocket - do not use deprecated member-function"Allan Sandfeld Jensen2020-02-271-1/+1
* | WebSocketServer: Add Q_(UN)LIKELYAndre Hartmann2020-02-261-6/+6
* | Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-251-1/+1
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-251-2/+3
|\ \ | |/
| * Doc: fix missing closing commentAndre Hartmann2020-02-241-0/+1
| * Doc: fix links to autobahn testsuiteAndre Hartmann2020-02-241-2/+2
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\ \ | |/
| * Bump versionAlexandru Croitor2020-02-021-1/+1
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-211-0/+20
| |/
* | Change QMap to QMultiMapMårten Nordheim2020-01-234-6/+6
* | Stop forcing deprecated ssl protocol versionMårten Nordheim2020-01-172-2/+0
* | QWebSocket - do not use deprecated member-functionTimur Pocheptsov2020-01-151-1/+1
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-0/+6021
|\ \ | |/
| * Bump versionDaniel Smith2019-12-161-1/+1
| * Add binary compatibility file for qtwebsockets 5.14 branchMilla Pohjanheimo2019-12-161-0/+6021
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-143-7/+37
|\ \ | |/
| * Remove extra deleteLater (already done in onSocketDisconnected)Franck Dude2019-12-131-1/+0
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-132-6/+37
| |\
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-261-0/+35
| | * Don't add port in Host header unless specifiedLander Noterman2019-11-211-6/+2
| |/
* | Add protection against handshake header too largeFranck Dude2019-12-131-1/+9
* | Fix websocket handshake request header parsingFranck Dude2019-12-133-8/+33
* | Cleanup QWebSocketFrameChristian Ehrlicher2019-11-263-162/+26
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-161-25/+0
|\ \ | |/
| * Doc: Remove broken documentation commentsTopi Reinio2019-11-111-25/+0
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| |\
| | * Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-181-0/+20
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-261-1/+1
|\ \ \ | |/ /
| * | Update plugins.qmltypes for 5.14Kai Koehne2019-10-221-1/+1
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-123-4/+46
|\ \ \ | |/ /
| * | Add support for chrono versions of handshakeTimeout functionsv5.14.0-beta2Mårten Nordheim2019-10-093-4/+46
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-243-4/+52
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-243-4/+52
| |\ \ \ |/ / / / | | _ / | | /
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta1v5.14.0-alpha1Qt Forward Merge Bot2019-09-173-4/+52
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-173-4/+52
| | |\ \ | |/ / / | | | _