Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-websockets for openSUSE:Factory checked in at 2023-03-17 17:03:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-websockets (Old) and /work/SRC/openSUSE:Factory/.qt6-websockets.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-websockets" Fri Mar 17 17:03:51 2023 rev:12 rq:1072427 version:6.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-websockets/qt6-websockets.changes 2023-01-11 14:35:49.501492258 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-websockets.new.31432/qt6-websockets.changes 2023-03-17 17:04:28.089745355 +0100 @@ -1,0 +2,6 @@ +Thu Mar 16 10:00:13 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 6.4.3: + * https://www.qt.io/blog/qt-6.4.3-released + +------------------------------------------------------------------- Old: ---- qtwebsockets-everywhere-src-6.4.2.tar.xz New: ---- qtwebsockets-everywhere-src-6.4.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-websockets.spec ++++++ --- /var/tmp/diff_new_pack.ZoqvV1/_old 2023-03-17 17:04:28.829749255 +0100 +++ /var/tmp/diff_new_pack.ZoqvV1/_new 2023-03-17 17:04:28.833749276 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.4.2 +%define real_version 6.4.3 %define short_version 6.4 %define tar_name qtwebsockets-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-websockets%{?pkg_suffix} -Version: 6.4.2 +Version: 6.4.3 Release: 0 Summary: Qt 6 WebSockets library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) @@ -108,8 +108,7 @@ # CMake files are not needed for plugins rm -r %{buildroot}%{_qt6_cmakedir}/Qt6Qml/QmlPlugins -%post -n libQt6WebSockets6 -p /sbin/ldconfig -%postun -n libQt6WebSockets6 -p /sbin/ldconfig +%ldconfig_scriptlets -n libQt6WebSockets6 %files imports %{_qt6_qmldir}/QtWebSockets/ ++++++ qtwebsockets-everywhere-src-6.4.2.tar.xz -> qtwebsockets-everywhere-src-6.4.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/.QT-ENTERPRISE-LICENSE-AGREEMENT new/qtwebsockets-everywhere-src-6.4.3/.QT-ENTERPRISE-LICENSE-AGREEMENT --- old/qtwebsockets-everywhere-src-6.4.2/.QT-ENTERPRISE-LICENSE-AGREEMENT 2022-12-13 08:05:05.752460000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/.QT-ENTERPRISE-LICENSE-AGREEMENT 2023-03-12 11:00:39.226240600 +0100 @@ -1061,6 +1061,7 @@ - Appendix 8: Intentionally left blank (optional) - Appendix 9: Support Terms - Appendix 10: Conversion from legacy Licenses to Subscription (optional) +- Appendix 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY APPENDIX 1: LICENSED SOFTWARE @@ -1975,3 +1976,46 @@ will continue to make such payments in accordance with the applicable order documentation, notwithstanding the fact that the Current Licenses are being converted to Development Licenses pursuant to this Appendix. + +APPENDIX 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY +Version 1.0 + +Qt Insight Tracker Library ("Tracker Library") is a software module used to +collect end user data from Customer's Application and Devices relating to The +Qt Company's Qt Insight online service the Customer is ordering from The Qt +Company under a separate service agreement ("Service Agreement"). + +Unless otherwise set forth herein, definitions written in capital letters used +herein shall have the meaning set forth in the Service Agreement. + +Subject to these terms The Qt Company grants to Customer a worldwide, +non-exclusive, non-transferable, royalty-free, revocable (for cause) right and +license, valid for the term of the Service Agreement, to + (i) use, copy and modify Tracker Library for the purpose of including it + into the Devices and Applications and solely for the purpose of being + used only in conjunction with Insight Cloud or Insight Private Cloud, + and + (ii) distribute, by itself or through its Contractors, Tracker Library as + installed, incorporated, or integrated into Applications and/or + Devices. + +Use of Tracker Library in a way or for the purpose other than the above is +strictly prohibited. Tracker Library is licensed to the Customer in all +respects "as is". + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF +ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER +WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND +NON-INFRINGEMENT WITH REGARD TO THE TRACKER LIBRARY. THE QT COMPANY DOES NOT +WARRANT THAT THE TRACKER LIBRARY WILL SATISFY CUSTOMER'S REQUIREMENTS OR THAT +IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE +UNINTERRUPTED. +IN NO EVENT SHALL THE QT COMPANY BE LIABLE TO THE CUSTOMER FOR ANY LOSS OF +PROFIT, LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, +SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY +KIND, HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THE USE OF THE TRACKER +LIBRARY. + +THE TOTAL MAXIMUM LIABILITY OF THE QT COMPANY UNDER THESE TERMS SHALL IN NO +EVENT EXCEED 10,000 EUROS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/.cmake.conf new/qtwebsockets-everywhere-src-6.4.3/.cmake.conf --- old/qtwebsockets-everywhere-src-6.4.2/.cmake.conf 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/.cmake.conf 2023-03-12 03:16:37.000000000 +0100 @@ -1,2 +1,2 @@ -set(QT_REPO_MODULE_VERSION "6.4.2") +set(QT_REPO_MODULE_VERSION "6.4.3") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/.tag new/qtwebsockets-everywhere-src-6.4.3/.tag --- old/qtwebsockets-everywhere-src-6.4.2/.tag 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/.tag 2023-03-12 03:16:37.000000000 +0100 @@ -1 +1 @@ -ae9a4ad36f5dcbe9e9a68cab9ea15f9f8b5350e3 +5c50ad5eef1fc179d846e175b0612a76b2a63d09 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/dependencies.yaml new/qtwebsockets-everywhere-src-6.4.3/dependencies.yaml --- old/qtwebsockets-everywhere-src-6.4.2/dependencies.yaml 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/dependencies.yaml 2023-03-12 03:16:37.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: e3e40c44d3f998a433a6a1080297c5f28e9a768f + ref: 519d2d8f442409e86a0ee2fa16bd543342180861 required: true ../qtdeclarative: - ref: 1b58f30087eedf42f16572d8ae1d6a5b18f3d698 + ref: 7161b3a04d08aea891bd7c7e459437260d29c3f3 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qdefaultmaskgenerator_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qdefaultmaskgenerator_p.h 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qdefaultmaskgenerator_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocket_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocket_p.h 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocket_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocket_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketdataprocessor_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketdataprocessor_p.h 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketdataprocessor_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketframe_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketframe_p.h 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketframe_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocketframe_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakeoptions_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakeoptions_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakeoptions_p.h 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakeoptions_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsockethandshakeoptions_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakerequest_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakerequest_p.h 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakerequest_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketprotocol_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketprotocol_p.h 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketprotocol_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocketprotocol_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketserver_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketserver_p.h 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.2/QtWebSockets/private/qwebsocketserver_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#include "../../../../../src/websockets/qwebsocketserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qdefaultmaskgenerator_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qdefaultmaskgenerator_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qdefaultmaskgenerator_p.h 2023-03-12 03:16:37.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocket_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocket_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocket_p.h 2023-03-12 03:16:37.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocket_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2023-03-12 03:16:37.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketdataprocessor_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketdataprocessor_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketdataprocessor_p.h 2023-03-12 03:16:37.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketframe_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketframe_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketframe_p.h 2023-03-12 03:16:37.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketframe_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeoptions_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeoptions_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeoptions_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeoptions_p.h 2023-03-12 03:16:37.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsockethandshakeoptions_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakerequest_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakerequest_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakerequest_p.h 2023-03-12 03:16:37.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2023-03-12 03:16:37.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketprotocol_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketprotocol_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketprotocol_p.h 2023-03-12 03:16:37.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketprotocol_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketserver_p.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketserver_p.h 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/6.4.3/QtWebSockets/private/qwebsocketserver_p.h 2023-03-12 03:16:37.000000000 +0100 @@ -0,0 +1 @@ +#include "../../../../../src/websockets/qwebsocketserver_p.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/qtwebsocketsversion.h new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qtwebsocketsversion.h --- old/qtwebsockets-everywhere-src-6.4.2/include/QtWebSockets/qtwebsocketsversion.h 2022-12-13 08:05:05.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/include/QtWebSockets/qtwebsocketsversion.h 2023-03-12 11:00:39.218240500 +0100 @@ -2,8 +2,8 @@ #ifndef QT_QTWEBSOCKETS_VERSION_H #define QT_QTWEBSOCKETS_VERSION_H -#define QTWEBSOCKETS_VERSION_STR "6.4.2" +#define QTWEBSOCKETS_VERSION_STR "6.4.3" -#define QTWEBSOCKETS_VERSION 0x060402 +#define QTWEBSOCKETS_VERSION 0x060403 #endif // QT_QTWEBSOCKETS_VERSION_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/src/websockets/qwebsocket_p.cpp new/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket_p.cpp --- old/qtwebsockets-everywhere-src-6.4.2/src/websockets/qwebsocket_p.cpp 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket_p.cpp 2023-03-12 03:16:37.000000000 +0100 @@ -174,6 +174,10 @@ */ QWebSocketPrivate::~QWebSocketPrivate() { +#ifdef Q_OS_WASM + if (m_socketContext) + emscripten_websocket_delete(m_socketContext); +#endif } /*! @@ -1056,7 +1060,7 @@ QString::number(acceptKey.size()), QString::number(parser.getMajorVersion()), QString::number(parser.getMinorVersion()), upgrade, connection); errorDescription = QWebSocket::tr( - "Invalid parameter(s) presented during protocol upgrade: %1").arg(upgradeParms); + "Invalid parameter encountered during protocol upgrade: %1").arg(upgradeParms); } } else if (parser.getStatusCode() == 400) { //HTTP/1.1 400 Bad Request @@ -1092,6 +1096,8 @@ // handshake failed setErrorString(errorDescription); Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); + if (m_pSocket->state() != QAbstractSocket::UnconnectedState) + m_pSocket->disconnectFromHost(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/src/websockets/qwebsocket_wasm_p.cpp new/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket_wasm_p.cpp --- old/qtwebsockets-everywhere-src-6.4.2/src/websockets/qwebsocket_wasm_p.cpp 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/src/websockets/qwebsocket_wasm_p.cpp 2023-03-12 03:16:37.000000000 +0100 @@ -111,14 +111,14 @@ Q_EMIT q->aboutToClose(); setSocketState(QAbstractSocket::ClosingState); - emscripten_websocket_get_ready_state(m_socketContext, &m_readyState); if (m_readyState == 1) { emscripten_websocket_close(m_socketContext, (int)closeCode, reason.toUtf8()); } + setSocketState(QAbstractSocket::UnconnectedState); + emit q->disconnected(); emscripten_websocket_get_ready_state(m_socketContext, &m_readyState); - } void QWebSocketPrivate::open(const QNetworkRequest &request, @@ -241,8 +241,7 @@ m_errorString = QStringLiteral("The remote host closed the connection"); emit q->error(error()); } - setSocketState(QAbstractSocket::UnconnectedState); - emit q->disconnected(); + emscripten_websocket_get_ready_state(m_socketContext, &m_readyState); if (m_readyState == 3) { // closed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.4.2/tests/auto/websockets/handshakerequest/BLACKLIST new/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/handshakerequest/BLACKLIST --- old/qtwebsockets-everywhere-src-6.4.2/tests/auto/websockets/handshakerequest/BLACKLIST 2022-12-12 18:11:36.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.4.3/tests/auto/websockets/handshakerequest/BLACKLIST 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# QTBUG-84315 -[tst_qtbug_57357:invalid-2] -* -[tst_qtbug_57357:invalid-4] -*
