Hello community,
here is the log from the commit of package libqt5-qtwebsockets for
openSUSE:Factory checked in at 2017-12-08 12:53:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebsockets (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebsockets"
Fri Dec 8 12:53:16 2017 rev:21 rq:545967 version:5.9.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebsockets/libqt5-qtwebsockets.changes
2017-10-23 16:21:29.230008343 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new/libqt5-qtwebsockets.changes
2017-12-08 12:53:29.098142770 +0100
@@ -1,0 +2,8 @@
+Sat Nov 25 12:46:51 UTC 2017 - fab...@ritter-vogt.de
+
+- Update to 5.9.3
+ * New bugfix release
+ * For more details, see:
+
http://code.qt.io/cgit/qt/qtwebsockets.git/tree/dist/changes-5.9.3/?h=v5.9.3
+
+-------------------------------------------------------------------
Old:
----
qtwebsockets-opensource-src-5.9.2.tar.xz
New:
----
qtwebsockets-opensource-src-5.9.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebsockets.spec ++++++
--- /var/tmp/diff_new_pack.vaLBpZ/_old 2017-12-08 12:53:30.134105356 +0100
+++ /var/tmp/diff_new_pack.vaLBpZ/_new 2017-12-08 12:53:30.134105356 +0100
@@ -21,15 +21,15 @@
%define libname libQt5WebSockets5
Name: libqt5-qtwebsockets
-Version: 5.9.2
+Version: 5.9.3
Release: 0
Summary: Qt 5 WebSockets Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
-%define real_version 5.9.2
-%define so_version 5.9.2
+%define real_version 5.9.3
+%define so_version 5.9.3
%define tar_version qtwebsockets-opensource-src-%{real_version}
Source:
https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
++++++ qtwebsockets-opensource-src-5.9.2.tar.xz ->
qtwebsockets-opensource-src-5.9.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-opensource-src-5.9.2/.qmake.conf
new/qtwebsockets-opensource-src-5.9.3/.qmake.conf
--- old/qtwebsockets-opensource-src-5.9.2/.qmake.conf 2017-09-28
10:59:17.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.9.3/.qmake.conf 2017-11-08
13:48:57.000000000 +0100
@@ -3,4 +3,4 @@
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.9.2
+MODULE_VERSION = 5.9.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-opensource-src-5.9.2/.tag
new/qtwebsockets-opensource-src-5.9.3/.tag
--- old/qtwebsockets-opensource-src-5.9.2/.tag 2017-09-28 10:59:17.000000000
+0200
+++ new/qtwebsockets-opensource-src-5.9.3/.tag 2017-11-08 13:48:57.000000000
+0100
@@ -1 +1 @@
-492981b93295f575ad77b6767dc5b8851287aa2e
+67f6e5e282c21495794741dd2242e4965b716b96
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-opensource-src-5.9.2/dist/changes-5.9.3
new/qtwebsockets-opensource-src-5.9.3/dist/changes-5.9.3
--- old/qtwebsockets-opensource-src-5.9.2/dist/changes-5.9.3 1970-01-01
01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.9.3/dist/changes-5.9.3 2017-11-08
13:48:57.000000000 +0100
@@ -0,0 +1,26 @@
+Qt 5.9.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Qt 5.9.3 Changes *
+****************************************************************************
+
+ - Fixed a race condition in QWebSocketServer where the server would,
+ in rare cases, miss the start of the handshake coming from a client.
+ - Other minor code improvements.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qdefaultmaskgenerator_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qdefaultmaskgenerator_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qdefaultmaskgenerator_p.h
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.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-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qsslserver_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qsslserver_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qsslserver_p.h
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qsslserver_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qsslserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocket_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocket_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocket_p.h
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.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-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.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-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketdataprocessor_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketdataprocessor_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketdataprocessor_p.h
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.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-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketframe_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketframe_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketframe_p.h
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.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-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsockethandshakerequest_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsockethandshakerequest_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsockethandshakerequest_p.h
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.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-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsockethandshakeresponse_p.h
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.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-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketprotocol_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketprotocol_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketprotocol_p.h
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.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-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketserver_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketserver_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.2/QtWebSockets/private/qwebsocketserver_p.h
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.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-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qdefaultmaskgenerator_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qdefaultmaskgenerator_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qdefaultmaskgenerator_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qdefaultmaskgenerator_p.h
2017-11-08 13:48:57.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qsslserver_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qsslserver_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qsslserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qsslserver_p.h
2017-11-08 13:48:57.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qsslserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocket_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocket_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocket_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocket_p.h
2017-11-08 13:48:57.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
2017-11-08 13:48:57.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketdataprocessor_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketdataprocessor_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketdataprocessor_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketdataprocessor_p.h
2017-11-08 13:48:57.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketframe_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketframe_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketframe_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketframe_p.h
2017-11-08 13:48:57.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketframe_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsockethandshakerequest_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsockethandshakerequest_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsockethandshakerequest_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsockethandshakerequest_p.h
2017-11-08 13:48:57.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsockethandshakeresponse_p.h
2017-11-08 13:48:57.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketprotocol_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketprotocol_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketprotocol_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketprotocol_p.h
2017-11-08 13:48:57.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketprotocol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketserver_p.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketserver_p.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/5.9.3/QtWebSockets/private/qwebsocketserver_p.h
2017-11-08 13:48:57.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/qtwebsocketsversion.h
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/qtwebsocketsversion.h
---
old/qtwebsockets-opensource-src-5.9.2/include/QtWebSockets/qtwebsocketsversion.h
2017-10-04 09:13:41.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/include/QtWebSockets/qtwebsocketsversion.h
2017-11-20 14:40:15.000000000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTWEBSOCKETS_VERSION_H
#define QT_QTWEBSOCKETS_VERSION_H
-#define QTWEBSOCKETS_VERSION_STR "5.9.2"
+#define QTWEBSOCKETS_VERSION_STR "5.9.3"
-#define QTWEBSOCKETS_VERSION 0x050902
+#define QTWEBSOCKETS_VERSION 0x050903
#endif // QT_QTWEBSOCKETS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/src/websockets/doc/snippets/src_websockets_ssl_qwebsocket.cpp
new/qtwebsockets-opensource-src-5.9.3/src/websockets/doc/snippets/src_websockets_ssl_qwebsocket.cpp
---
old/qtwebsockets-opensource-src-5.9.2/src/websockets/doc/snippets/src_websockets_ssl_qwebsocket.cpp
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/src/websockets/doc/snippets/src_websockets_ssl_qwebsocket.cpp
2017-11-08 13:48:57.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2013 Kurt Pattyn <pattyn.k...@gmail.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/src/websockets/doc/src/external-resources.qdoc
new/qtwebsockets-opensource-src-5.9.3/src/websockets/doc/src/external-resources.qdoc
---
old/qtwebsockets-opensource-src-5.9.2/src/websockets/doc/src/external-resources.qdoc
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/src/websockets/doc/src/external-resources.qdoc
2017-11-08 13:48:57.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/src/websockets/doc/src/index.qdoc
new/qtwebsockets-opensource-src-5.9.3/src/websockets/doc/src/index.qdoc
--- old/qtwebsockets-opensource-src-5.9.2/src/websockets/doc/src/index.qdoc
2017-09-28 10:59:17.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.9.3/src/websockets/doc/src/index.qdoc
2017-11-08 13:48:57.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2013 Kurt Pattyn <pattyn.k...@gmail.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/src/websockets/doc/src/overview.qdoc
new/qtwebsockets-opensource-src-5.9.3/src/websockets/doc/src/overview.qdoc
--- old/qtwebsockets-opensource-src-5.9.2/src/websockets/doc/src/overview.qdoc
2017-09-28 10:59:17.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.9.3/src/websockets/doc/src/overview.qdoc
2017-11-08 13:48:57.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/src/websockets/doc/src/qtwebsockets-module.qdoc
new/qtwebsockets-opensource-src-5.9.3/src/websockets/doc/src/qtwebsockets-module.qdoc
---
old/qtwebsockets-opensource-src-5.9.2/src/websockets/doc/src/qtwebsockets-module.qdoc
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/src/websockets/doc/src/qtwebsockets-module.qdoc
2017-11-08 13:48:57.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2013 Kurt Pattyn <pattyn.k...@gmail.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
**
@@ -11,8 +11,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
** $QT_END_LICENSE$
**
****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/src/websockets/qwebsocket_p.cpp
new/qtwebsockets-opensource-src-5.9.3/src/websockets/qwebsocket_p.cpp
--- old/qtwebsockets-opensource-src-5.9.2/src/websockets/qwebsocket_p.cpp
2017-09-28 10:59:17.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.9.3/src/websockets/qwebsocket_p.cpp
2017-11-08 13:48:57.000000000 +0100
@@ -596,6 +596,9 @@
QObject::connect(sslSocket, &QSslSocket::encryptedBytesWritten, q,
&QWebSocket::bytesWritten);
typedef void (QSslSocket:: *sslErrorSignalType)(const
QList<QSslError> &);
+ QObjectPrivate::connect(sslSocket,
+
static_cast<sslErrorSignalType>(&QSslSocket::sslErrors),
+ this,
&QWebSocketPrivate::_q_updateSslConfiguration);
QObject::connect(sslSocket,
static_cast<sslErrorSignalType>(&QSslSocket::sslErrors),
q, &QWebSocket::sslErrors);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/src/websockets/qwebsockethandshakerequest.cpp
new/qtwebsockets-opensource-src-5.9.3/src/websockets/qwebsockethandshakerequest.cpp
---
old/qtwebsockets-opensource-src-5.9.2/src/websockets/qwebsockethandshakerequest.cpp
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/src/websockets/qwebsockethandshakerequest.cpp
2017-11-08 13:48:57.000000000 +0100
@@ -318,17 +318,17 @@
//optional headers
m_origin = m_headers.value(QStringLiteral("origin"), QString());
const QStringList protocolLines =
m_headers.values(QStringLiteral("sec-websocket-protocol"));
- for (QStringList::const_iterator pl = protocolLines.begin(); pl !=
protocolLines.end(); ++pl) {
- QStringList protocols = (*pl).split(QStringLiteral(","),
QString::SkipEmptyParts);
- for (QStringList::const_iterator p = protocols.begin(); p !=
protocols.end(); ++p)
- m_protocols << (*p).trimmed();
+ for (const QString& pl : protocolLines) {
+ const QStringList protocols = pl.split(QStringLiteral(","),
QString::SkipEmptyParts);
+ for (const QString& p : protocols)
+ m_protocols << p.trimmed();
}
+
const QStringList extensionLines =
m_headers.values(QStringLiteral("sec-websocket-extensions"));
- for (QStringList::const_iterator el = extensionLines.begin();
- el != extensionLines.end(); ++el) {
- QStringList extensions = (*el).split(QStringLiteral(","),
QString::SkipEmptyParts);
- for (QStringList::const_iterator e = extensions.begin(); e !=
extensions.end(); ++e)
- m_extensions << (*e).trimmed();
+ for (const QString& el : extensionLines) {
+ const QStringList extensions = el.split(QStringLiteral(","),
QString::SkipEmptyParts);
+ for (const QString& e : extensions)
+ m_extensions << e.trimmed();
}
//TODO: authentication field
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/src/websockets/qwebsocketserver_p.cpp
new/qtwebsockets-opensource-src-5.9.3/src/websockets/qwebsocketserver_p.cpp
--- old/qtwebsockets-opensource-src-5.9.2/src/websockets/qwebsocketserver_p.cpp
2017-09-28 10:59:17.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.9.3/src/websockets/qwebsocketserver_p.cpp
2017-11-08 13:48:57.000000000 +0100
@@ -490,6 +490,11 @@
QObjectPrivate::connect(pTcpSocket, &QTcpSocket::readyRead,
this,
&QWebSocketServerPrivate::handshakeReceived,
Qt::QueuedConnection);
+ if (pTcpSocket->canReadLine()) {
+ // We received some data! We must emit now to be sure that
handshakeReceived is called
+ // since the data could have been received before the signal and
slot was connected.
+ emit pTcpSocket->readyRead();
+ }
QObjectPrivate::connect(pTcpSocket, &QTcpSocket::disconnected,
this,
&QWebSocketServerPrivate::onSocketDisconnected);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.9.2/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
new/qtwebsockets-opensource-src-5.9.3/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
---
old/qtwebsockets-opensource-src-5.9.2/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
2017-09-28 10:59:17.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.9.3/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
2017-11-08 13:48:57.000000000 +0100
@@ -31,9 +31,9 @@
#include <QTcpServer>
#ifndef QT_NO_OPENSSL
#include <QtNetwork/qsslpresharedkeyauthenticator.h>
-#include <QtNetwork/qsslcipher.h>
#endif
#ifndef QT_NO_SSL
+#include <QtNetwork/qsslcipher.h>
#include <QtNetwork/qsslkey.h>
#endif
#include <QtWebSockets/QWebSocketServer>
@@ -261,7 +261,7 @@
QVERIFY(server.isListening());
QCOMPARE(serverClosedSpy.count(), 0);
server.close();
- QVERIFY(serverClosedSpy.wait(1000));
+ QTRY_COMPARE(serverClosedSpy.count(), 1);
QVERIFY(!server.isListening());
QCOMPARE(serverErrorSpy.count(), 0);
@@ -304,8 +304,7 @@
socket.open(server.serverUrl().toString());
- if (socketConnectedSpy.count() == 0)
- QVERIFY(socketConnectedSpy.wait());
+ QTRY_COMPARE(socketConnectedSpy.count(), 1);
QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
QCOMPARE(serverConnectionSpy.count(), 1);
QCOMPARE(corsAuthenticationSpy.count(), 1);
@@ -314,8 +313,7 @@
server.close();
- QVERIFY(serverClosedSpy.wait());
- QCOMPARE(serverClosedSpy.count(), 1);
+ QTRY_COMPARE(serverClosedSpy.count(), 1);
#ifndef QT_NO_SSL
QCOMPARE(peerVerifyErrorSpy.count(), 0);
QCOMPARE(sslErrorsSpy.count(), 0);
@@ -383,8 +381,7 @@
socket.open(server.serverUrl().toString());
- if (socketConnectedSpy.count() == 0)
- QVERIFY(socketConnectedSpy.wait());
+ QTRY_COMPARE(socketConnectedSpy.count(), 1);
QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
QCOMPARE(serverConnectionSpy.count(), 1);
QCOMPARE(serverPskRequiredSpy.count(), 1);
@@ -394,8 +391,7 @@
server.close();
- QVERIFY(serverClosedSpy.wait());
- QCOMPARE(serverClosedSpy.count(), 1);
+ QTRY_COMPARE(serverClosedSpy.count(), 1);
QCOMPARE(sslErrorsSpy.count(), 0);
QCOMPARE(serverErrorSpy.count(), 0);
#endif
@@ -431,20 +427,18 @@
socket1.open(server.serverUrl().toString());
- if (socket1ConnectedSpy.count() == 0)
- QVERIFY(socket1ConnectedSpy.wait());
+ QTRY_COMPARE(socket1ConnectedSpy.count(), 1);
QCOMPARE(socket1.state(), QAbstractSocket::ConnectedState);
QCOMPARE(serverConnectionSpy.count(), 1);
QCOMPARE(corsAuthenticationSpy.count(), 1);
socket2.open(server.serverUrl().toString());
- if (socket2ConnectedSpy.count() == 0)
- QVERIFY(socket2ConnectedSpy.wait());
+ QTRY_COMPARE(socket2ConnectedSpy.count(), 1);
QCOMPARE(socket2.state(), QAbstractSocket::ConnectedState);
QCOMPARE(serverConnectionSpy.count(), 2);
QCOMPARE(corsAuthenticationSpy.count(), 2);
socket3.open(server.serverUrl().toString());
- if (socket3ConnectedSpy.count() == 0)
- QVERIFY(!socket3ConnectedSpy.wait(250));
+ QVERIFY(!socket3ConnectedSpy.wait(250));
+ QCOMPARE(socket3ConnectedSpy.count(), 0);
QCOMPARE(socket3.state(), QAbstractSocket::UnconnectedState);
QCOMPARE(serverConnectionSpy.count(), 2);
QCOMPARE(corsAuthenticationSpy.count(), 2);
@@ -470,8 +464,7 @@
server.close();
- QVERIFY(serverClosedSpy.wait());
- QCOMPARE(serverClosedSpy.count(), 1);
+ QTRY_COMPARE(serverClosedSpy.count(), 1);
#ifndef QT_NO_SSL
QCOMPARE(peerVerifyErrorSpy.count(), 0);
QCOMPARE(sslErrorsSpy.count(), 0);
@@ -498,8 +491,7 @@
socket.open(server->serverUrl().toString());
- if (socketConnectedSpy.count() == 0)
- QVERIFY(socketConnectedSpy.wait());
+ QTRY_COMPARE(socketConnectedSpy.count(), 1);
QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
QCOMPARE(serverConnectionSpy.count(), 1);
QCOMPARE(corsAuthenticationSpy.count(), 1);
@@ -508,9 +500,7 @@
delete server;
- if (socketDisconnectedSpy.count() == 0)
- QVERIFY(socketDisconnectedSpy.wait());
- QCOMPARE(socketDisconnectedSpy.count(), 1);
+ QTRY_COMPARE(socketDisconnectedSpy.count(), 1);
}
void tst_QWebSocketServer::tst_scheme()
@@ -523,8 +513,7 @@
QWebSocket plainSocket;
plainSocket.open(plainServer.serverUrl().toString());
- if (plainServerConnectionSpy.count() == 0)
- QVERIFY(plainServerConnectionSpy.wait());
+ QTRY_COMPARE(plainServerConnectionSpy.count(), 1);
QScopedPointer<QWebSocket>
plainServerSocket(plainServer.nextPendingConnection());
QVERIFY(!plainServerSocket.isNull());
QCOMPARE(plainServerSocket->requestUrl().scheme(), QStringLiteral("ws"));
@@ -550,18 +539,21 @@
QVERIFY(secureServer.listen());
+ QSslCipher sessionCipher;
QWebSocket secureSocket;
- typedef void (QWebSocket::* ignoreSslErrorsSlot)();
connect(&secureSocket, &QWebSocket::sslErrors,
- &secureSocket,
static_cast<ignoreSslErrorsSlot>(&QWebSocket::ignoreSslErrors));
+ &secureSocket, [&] {
+ secureSocket.ignoreSslErrors();
+ sessionCipher =
secureSocket.sslConfiguration().sessionCipher();
+ });
secureSocket.open(secureServer.serverUrl().toString());
- if (secureServerConnectionSpy.count() == 0)
- QVERIFY(secureServerConnectionSpy.wait());
+ QTRY_COMPARE(secureServerConnectionSpy.count(), 1);
QScopedPointer<QWebSocket>
secureServerSocket(secureServer.nextPendingConnection());
QVERIFY(!secureServerSocket.isNull());
QCOMPARE(secureServerSocket->requestUrl().scheme(), QStringLiteral("wss"));
secureServer.close();
+ QVERIFY(!sessionCipher.isNull());
#endif
}
@@ -580,19 +572,17 @@
QWebSocket webSocket;
QSignalSpy wsConnectedSpy(&webSocket, &QWebSocket::connected);
webSocket.open(QStringLiteral("ws://localhost:%1").arg(tcpServer.serverPort()));
- QVERIFY(wsConnectedSpy.wait());
+ QTRY_COMPARE(wsConnectedSpy.count(), 1);
- if (wsServerConnectionSpy.isEmpty())
- QVERIFY(wsServerConnectionSpy.wait());
+ QTRY_COMPARE(wsServerConnectionSpy.count(), 1);
QScopedPointer<QWebSocket>
webServerSocket(wsServer.nextPendingConnection());
QVERIFY(!webServerSocket.isNull());
QSignalSpy wsMessageReceivedSpy(webServerSocket.data(),
&QWebSocket::textMessageReceived);
webSocket.sendTextMessage("dummy");
- wsMessageReceivedSpy.wait();
- QCOMPARE(wsMessageReceivedSpy.count(), 1);
+ QTRY_COMPARE(wsMessageReceivedSpy.count(), 1);
QList<QVariant> arguments = wsMessageReceivedSpy.takeFirst();
QCOMPARE(arguments.first().toString(), QString("dummy"));
}
