delta/qt5/qtwebsockets.git - code.qt.io: qt/qtwebsockets.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \|	Merge remote-tracking branch 'origin/5.14' into 5.15	Qt Forward Merge Bot	2019-12-30	1	-0/+6021
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf Change-Id: Ic89c6250fae297177b4990de302b4bde71709216
\| \| \| *	Bump version	Daniel Smith	2019-12-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I486dace1520c7fc06e6233da8d1e0a52c7869cdb
\| \| \| *	Add binary compatibility file for qtwebsockets 5.14 branch	Milla Pohjanheimo	2019-12-16	1	-0/+6021
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BC file built against 5.14.0 added. Change-Id: Ib72e1fd443bf88cec944ab451edcc43ca070a135 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \|	Merge remote-tracking branch 'origin/5.15' into dev	Qt Forward Merge Bot	2019-12-21	3	-7/+37
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \|	Change-Id: I4373631f7e65c3b55178f308d0c7624d6fdf9108
\| \| * \|	Merge remote-tracking branch 'origin/5.14' into 5.15	Qt Forward Merge Bot	2019-12-14	3	-7/+37
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \|	Change-Id: Icd1a2fd565d5d85ac6d1378578a92dbb1a9692ce
\| \| \| *	Remove extra deleteLater (already done in onSocketDisconnected)	Franck Dude	2019-12-13	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I671d93ccd766fed4fff797930804ab748cbb27a1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
\| \| \| *	Merge remote-tracking branch 'origin/5.14.0' into 5.14	Qt Forward Merge Bot	2019-12-13	2	-6/+37
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I3445dc11f83f37a784867762691b372df47ff938
\| \| \| \| *	Add changes file for Qt 5.14.0v5.14.0-rc2 v5.14.0-rc1 v5.14.0 5.14.0	Antti Kokko	2019-11-26	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ic759bffc47f236217fde5db2c33260577366efc1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
\| \| \| \| *	Don't add port in Host header unless specified	Lander Noterman	2019-11-21	1	-6/+2
\| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No longer add port to Host header in WebSocket handshake unless it was explicitly specified in the URL. This change fixes issues with some WebSocket servers rejecting the connection if the Host header does not match the URL. Fixes: QTBUG-77526 Change-Id: I9b028ce434416e61cae7b217d2eafe621d2660b4 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
\| * \| \|	Merge remote-tracking branch 'origin/5.15' into dev	Qt Forward Merge Bot	2019-12-14	3	-8/+41
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \|	Change-Id: Iccdd320a4aadcb50043f7b56d8ee0b187c30b561
\| \| * \|	Add protection against handshake header too large	Franck Dude	2019-12-13	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-70691 Change-Id: I54b9f7157e5830b9efd8bae7d4777218857249b1 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
\| \| * \|	Fix websocket handshake request header parsing	Franck Dude	2019-12-13	3	-8/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Header ends with \r\n\r\n but there might be more data inside the tcpbuffer Never read past the header Task-number: QTBUG-70000 Change-Id: If3d4cb362646e43a91faf00f89e50510ff00fa56 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
\| * \| \|	Merge remote-tracking branch 'origin/5.15' into dev	Qt Forward Merge Bot	2019-12-03	3	-162/+26
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \|	Change-Id: Ia2b25c8d0d90f82ad8273649bfb864979970938d
\| \| * \|	Cleanup QWebSocketFrame	Christian Ehrlicher	2019-11-26	3	-162/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove QWebSocketFrame assignment and move stuff by our own - the default ones are good. Also reorder the members to reduce the padding (56 to 48 bytes on 64bits). Change-Id: Ib4628628af924c36ad3cd9bf67ce72752ef97ff5 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
\| * \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-11-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I8c90032bf6823a9481c10dbad614f87b81a40c30 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-11-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I233416b8d4b357cdbfd788e06100c9214073ce85 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-11-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I47164684ed881a22d2dd5b2ad9ce66f15ede42e6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-11-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Id7ee3a6dbe7f76861b2261b315fbc74026c7b347 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \|	Merge remote-tracking branch 'origin/5.15' into dev	Qt Forward Merge Bot	2019-11-19	1	-25/+0
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \|	Change-Id: Ibddd2a65d47e382c7857ed97bcf978c32c6ea1b3
\| \| * \|	Merge remote-tracking branch 'origin/5.14' into 5.15	Qt Forward Merge Bot	2019-11-16	1	-25/+0
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \|	Change-Id: I9b0aaaa5d918a28bdd388e3c1988e0bc804255db
\| \| \| *	Doc: Remove broken documentation comments	Topi Reinio	2019-11-11	1	-25/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QWebSocketServer::nativeDescriptor() and its setter were documented twice, with the duplicated versions under Qt6-specific version check macro and marked \deprecated. QDoc still parses those in Qt5 as it doesn't respect the version guards - remove the offending comments for now. Fixes: QTBUG-79816 Change-Id: Ie40190c9d32f91efd3428b7f884c9ad923a2bb0e Reviewed-by: Paul Wicking <paul.wicking@qt.io>
\| * \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-11-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iff69650c8f3e33b10355a26229db8b1865e2adb0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-11-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I8dd62f342ef7dea2e0a6db63f8cd50e89bea78a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \|	Merge remote-tracking branch 'origin/5.15' into dev	Qt Forward Merge Bot	2019-11-12	1	-0/+20
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \|	Change-Id: I545f1a9053064d82b4f45889306302016c487736
\| \| * \|	Merge remote-tracking branch 'origin/5.14' into 5.15	Qt Forward Merge Bot	2019-11-09	1	-0/+20
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \|	Change-Id: I590fe7a055b7246923d75dcce0f41075a44b0892
\| \| \| *	Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3	Qt Forward Merge Bot	2019-11-05	1	-0/+20
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf Change-Id: Ic8cd4116fcfa47f7457d8a630274d6745723c858
\| \| \| \| *	Add changes file for Qt 5.13.2v5.13.2 5.13.2 5.13	Antti Kokko	2019-10-18	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ 465c6c3914455e8ed20f938e5d4a35e6decb446c Add changes file for Qt 5.12.5 + 1deee2a4965fd7dc8a44c6d769519c4cbb11da4f Binary compatibility file against Qt5.13.0 for QtWebSockets + 24a9e0f961d84af037999771948d3d3d9c683a6c wasm: make sendBinaryMessage work in threaded mode Change-Id: I8a1c4a4cf79b9096c7cc735b936ca64e225faaff Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
\| \| \| \| *	Bump version	Frederik Gladhorn	2019-10-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I80b008b3cc1cf483656096bade145f05917defb5
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-11-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I38ec1c73737752079c6f2f329881fb242349d1aa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-11-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I3c9211d1967e5b6c5e106177e57a47eddd85b1c0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-11-02	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I40e7a0accad962227aad432347c6d981c48d867d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-11-02	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ibe3c16cb0fbc5cd38395e78374ce7ac602b2619a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Merge remote-tracking branch 'origin/5.15' into dev	Qt Forward Merge Bot	2019-11-02	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \|	Change-Id: I518af074d5a02b4ea129adfadaa4ec8aa8753112
\| \| * \| \|	Merge remote-tracking branch 'origin/5.14' into 5.15	Qt Forward Merge Bot	2019-10-26	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \|	Change-Id: I56626d23b09e833c162cacac6386c712d67236ec
\| \| \| * \|	Update plugins.qmltypes for 5.14	Kai Koehne	2019-10-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-78690 Change-Id: Ie1de2c3cf46edca2b1441ff94a9bb50cb507c057 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I8f0400d2b418d62e2a97eb5ad599087fddd91846 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ic83bbc995d2f5ccea1c84430873903e81841a2bf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I53224cf2feccd90894c3b753ecee1118b89e0598 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I4f75160336c14c748cec1db52c4cc1b994da9e80 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ifaa26be5b07d6c970984ed80a91845c9dfa32d28 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iaf9fc67d526c46cc8aa95cb28cdfca826ae7ad98 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I66cbc1255c07f092800c48411436922862ed5795 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I9223d71e054b2d5571423de86fd78ec2c1958cf8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I6ef6e94c9283801452b8f8014ea85ff45afecdd9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I1e071e29c101a329e52f2be8bb4a8b5d05b818d0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ibd93f9756da71d1f6212266a99afa148c5093700 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
\| * \| \| \|	Update dependencies on 'dev' in qt/qtwebsockets	Qt Submodule Update Bot	2019-10-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I5b64d0e7a739eb1a573d4a136b49326b17be06ea Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* \| \| \| \|	Regenerate projects	Alexandru Croitor	2019-11-15	15	-23/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ie454c70664c94743c0323d3d5fb8d4d7f224f3f1 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* \| \| \| \|	Merge remote-tracking branch 'origin/dev' into wip/cmake	Alexandru Croitor	2019-10-15	19	-224/+6444
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed dependencies.yaml. Change-Id: Ie799709d6a94054ca937c70a73fd979efb9619f7
\| * \| \| \|	Merge remote-tracking branch 'origin/5.15' into dev	Qt Forward Merge Bot	2019-10-15	3	-4/+46
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \|	Change-Id: Ide4779154e5b79b7068747272855fa43577cd6ae