Hello community,
here is the log from the commit of package libqt5-qtwebsockets for
openSUSE:Factory checked in at 2016-05-17 17:06:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebsockets (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebsockets"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebsockets/libqt5-qtwebsockets.changes
2015-10-19 22:46:46.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new/libqt5-qtwebsockets.changes
2016-05-17 17:06:13.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Mar 18 19:03:36 UTC 2016 - hrvoje.sen...@gmail.com
+
+- Update to 5.6.0
+ * For more details please see:
+ http://blog.qt.io/blog/2016/03/16/qt-5-6-released/
+ and https://wiki.qt.io/New_Features_in_Qt_5.6
+
+-------------------------------------------------------------------
Old:
----
qtwebsockets-opensource-src-5.5.1.tar.xz
New:
----
qtwebsockets-opensource-src-5.6.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebsockets.spec ++++++
--- /var/tmp/diff_new_pack.XI7pbb/_old 2016-05-17 17:06:14.000000000 +0200
+++ /var/tmp/diff_new_pack.XI7pbb/_new 2016-05-17 17:06:14.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtwebsockets
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,15 +21,15 @@
%define libname libQt5WebSockets5
Name: libqt5-qtwebsockets
-Version: 5.5.1
+Version: 5.6.0
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: http://qt.digia.com
%define base_name libqt5
-%define real_version 5.5.1
-%define so_version 5.5.1
+%define real_version 5.6.0
+%define so_version 5.6.0
%define tar_version qtwebsockets-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
@@ -129,23 +129,23 @@
%files -n %libname
%defattr(-,root,root,755)
-%doc LICENSE.*GPL*
+%doc *GPL*
%{_libqt5_libdir}/libQt5WebSockets.so.*
%files -n %libname-imports
%defattr(-,root,root,755)
-%doc LICENSE.*GPL*
+%doc *GPL*
%{_libqt5_archdatadir}/qml/Qt/WebSockets/
%{_libqt5_archdatadir}/qml/QtWebSockets/
%files private-headers-devel
%defattr(-,root,root,755)
-%doc LICENSE.*GPL*
+%doc *GPL*
%{_libqt5_includedir}/Qt*/%{so_version}
%files devel
%defattr(-,root,root,755)
-%doc LICENSE.*GPL*
+%doc *GPL*
%{_libqt5_includedir}/QtWebSockets
%exclude %{_libqt5_includedir}/Qt*/%{so_version}
%{_libqt5_includedir}/QtWebSockets
@@ -157,7 +157,7 @@
%files examples
%defattr(-,root,root,755)
-%doc LICENSE.*GPL*
+%doc *GPL*
%{_libqt5_examplesdir}/
%changelog
++++++ qtwebsockets-opensource-src-5.5.1.tar.xz ->
qtwebsockets-opensource-src-5.6.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-opensource-src-5.5.1/.qmake.conf
new/qtwebsockets-opensource-src-5.6.0/.qmake.conf
--- old/qtwebsockets-opensource-src-5.5.1/.qmake.conf 2015-10-13
06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/.qmake.conf 2016-02-15
13:41:23.000000000 +0100
@@ -3,4 +3,4 @@
CONFIG += qt_example_installs
CONFIG += warning_clean
-MODULE_VERSION = 5.5.1
+MODULE_VERSION = 5.6.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-opensource-src-5.5.1/.tag
new/qtwebsockets-opensource-src-5.6.0/.tag
--- old/qtwebsockets-opensource-src-5.5.1/.tag 2015-10-13 06:37:55.000000000
+0200
+++ new/qtwebsockets-opensource-src-5.6.0/.tag 2016-02-15 13:41:23.000000000
+0100
@@ -1 +1 @@
-12e424f241b29ef26ad2a3a70740d8b320e9e85a
+88946bbe209cb6148b4a3284077bb9a06c7bc1ef
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/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.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qsslserver_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/QtWebSockets/private/qsslserver_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qsslserver_p.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/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.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocket_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocket_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocket_p.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/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.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/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.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/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.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketframe_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketframe_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketframe_p.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/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.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/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.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/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.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketprotocol_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketprotocol_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketprotocol_p.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/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.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketserver_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketserver_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.5.1/QtWebSockets/private/qwebsocketserver_p.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.5.1/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.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qdefaultmaskgenerator_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qdefaultmaskgenerator_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qdefaultmaskgenerator_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qdefaultmaskgenerator_p.h
2016-02-15 13:41:23.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.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qsslserver_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qsslserver_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qsslserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qsslserver_p.h
2016-02-15 13:41:23.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.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocket_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocket_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocket_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocket_p.h
2016-02-15 13:41:23.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.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
2016-02-15 13:41:23.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.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketdataprocessor_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketdataprocessor_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketdataprocessor_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketdataprocessor_p.h
2016-02-15 13:41:23.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.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketframe_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketframe_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketframe_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketframe_p.h
2016-02-15 13:41:23.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.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakerequest_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakerequest_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakerequest_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakerequest_p.h
2016-02-15 13:41:23.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.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h
2016-02-15 13:41:23.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.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketprotocol_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketprotocol_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketprotocol_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketprotocol_p.h
2016-02-15 13:41:23.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.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketserver_p.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketserver_p.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketserver_p.h
2016-02-15 13:41:23.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.5.1/include/QtWebSockets/qtwebsocketsversion.h
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/qtwebsocketsversion.h
---
old/qtwebsockets-opensource-src-5.5.1/include/QtWebSockets/qtwebsocketsversion.h
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/qtwebsocketsversion.h
2016-03-13 17:25:48.000000000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTWEBSOCKETS_VERSION_H
#define QT_QTWEBSOCKETS_VERSION_H
-#define QTWEBSOCKETS_VERSION_STR "5.5.1"
+#define QTWEBSOCKETS_VERSION_STR "5.6.0"
-#define QTWEBSOCKETS_VERSION 0x050501
+#define QTWEBSOCKETS_VERSION 0x050600
#endif // QT_QTWEBSOCKETS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/imports/qmlwebsockets/plugins.qmltypes
new/qtwebsockets-opensource-src-5.6.0/src/imports/qmlwebsockets/plugins.qmltypes
---
old/qtwebsockets-opensource-src-5.5.1/src/imports/qmlwebsockets/plugins.qmltypes
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/src/imports/qmlwebsockets/plugins.qmltypes
2016-02-15 13:41:23.000000000 +0100
@@ -4,7 +4,7 @@
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -notrelocatable QtWebSockets 1.0'
+// 'qmlplugindump -nonrelocatable QtWebSockets 1.0'
Module {
dependencies: []
@@ -56,7 +56,7 @@
exportMetaObjectRevisions: [0]
Property { name: "url"; type: "QUrl"; isReadonly: true }
Property { name: "host"; type: "string" }
- Property { name: "port"; type: "ushort" }
+ Property { name: "port"; type: "int" }
Property { name: "name"; type: "string" }
Property { name: "errorString"; type: "string"; isReadonly: true }
Property { name: "listen"; type: "bool" }
@@ -75,7 +75,7 @@
}
Signal {
name: "portChanged"
- Parameter { name: "port"; type: "ushort" }
+ Parameter { name: "port"; type: "int" }
}
Signal {
name: "nameChanged"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/imports/qmlwebsockets_compat/plugins.qmltypes
new/qtwebsockets-opensource-src-5.6.0/src/imports/qmlwebsockets_compat/plugins.qmltypes
---
old/qtwebsockets-opensource-src-5.5.1/src/imports/qmlwebsockets_compat/plugins.qmltypes
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/src/imports/qmlwebsockets_compat/plugins.qmltypes
2016-02-15 13:41:23.000000000 +0100
@@ -4,7 +4,7 @@
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -notrelocatable Qt.WebSockets 1.0'
+// 'qmlplugindump -nonrelocatable Qt.WebSockets 1.0'
Module {
dependencies: []
@@ -56,7 +56,7 @@
exportMetaObjectRevisions: [0]
Property { name: "url"; type: "QUrl"; isReadonly: true }
Property { name: "host"; type: "string" }
- Property { name: "port"; type: "ushort" }
+ Property { name: "port"; type: "int" }
Property { name: "name"; type: "string" }
Property { name: "errorString"; type: "string"; isReadonly: true }
Property { name: "listen"; type: "bool" }
@@ -75,7 +75,7 @@
}
Signal {
name: "portChanged"
- Parameter { name: "port"; type: "ushort" }
+ Parameter { name: "port"; type: "int" }
}
Signal {
name: "nameChanged"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/doc/qtwebsockets.qdocconf
new/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/qtwebsockets.qdocconf
---
old/qtwebsockets-opensource-src-5.5.1/src/websockets/doc/qtwebsockets.qdocconf
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/qtwebsockets.qdocconf
2016-02-15 13:41:23.000000000 +0100
@@ -4,7 +4,7 @@
description = Qt WebSockets Reference
Documentation
version = $QT_VERSION
-examplesinstallpath = websockets
+examplesinstallpath = qtwebsockets/websockets
qhp.projects = QtWebSockets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/doc/src/overview.qdoc
new/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/src/overview.qdoc
--- old/qtwebsockets-opensource-src-5.5.1/src/websockets/doc/src/overview.qdoc
2015-10-13 06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/src/overview.qdoc
2016-02-15 13:41:23.000000000 +0100
@@ -90,23 +90,22 @@
The module provides both C++ and QML versions of the API, so you can choose
the alternative that suits your need.
-\section2 Qt WebSockets with Qt Cloud Services
+\section2 Qt WebSockets with Cloud Services
The client application usually depends on an external service for data. Most of
these service providers do not support WebSocket yet, so you end up developing
-a WebSocket-aware server application to bridge the gap. You can choose to run
-the server on an enterprise WebSocket gateway service such as Qt Cloud
-Services, avoiding the hassle of maintaining the necessary infrastructure
-required to host such a service.
+a WebSocket-aware server application to bridge the gap. You can run the server
+on an enterprise WebSocket gateway service such as a cloud service, avoiding
+the hassle of maintaining the necessary infrastructure required to host such
+a service.
-The Qt Cloud Services provides a Managed Application Runtime (MAR) backend,
-which enables deploying and running an instance of server application on the
-cloud. The server instance running on MAR gets a WebSocket URL, which can be
-used by the client applications to connect and receive data.
+Most of the cloud Services provide a Platform as a service (PaaS) backend,
+which enables deploying and running an instance of your server application on
+the cloud. The client applications can connect to the running server using a
+WebSocket URL and receive data.
\section2 Related Information
\list
\li \l {http://tools.ietf.org/html/rfc6455}{WebSocket RFC 6455}
-\li \l {https://qtcloudservices.com}{Qt Cloud Services}
\endlist
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qmaskgenerator.h
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qmaskgenerator.h
--- old/qtwebsockets-opensource-src-5.5.1/src/websockets/qmaskgenerator.h
2015-10-13 06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/src/websockets/qmaskgenerator.h
2016-02-15 13:41:23.000000000 +0100
@@ -34,7 +34,7 @@
#ifndef QMASKGENERATOR_H
#define QMASKGENERATOR_H
-#include <QObject>
+#include <QtCore/QObject>
#include "QtWebSockets/qwebsockets_global.h"
QT_BEGIN_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qsslserver_p.h
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qsslserver_p.h
--- old/qtwebsockets-opensource-src-5.5.1/src/websockets/qsslserver_p.h
2015-10-13 06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/src/websockets/qsslserver_p.h
2016-02-15 13:41:23.000000000 +0100
@@ -34,6 +34,17 @@
#ifndef QSSLSERVER_P_H
#define QSSLSERVER_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QtNetwork/QTcpServer>
#include <QtNetwork/QSslError>
#include <QtNetwork/QSslConfiguration>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocket.cpp
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket.cpp
--- old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocket.cpp
2015-10-13 06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket.cpp
2016-02-15 13:41:23.000000000 +0100
@@ -391,7 +391,22 @@
void QWebSocket::open(const QUrl &url)
{
Q_D(QWebSocket);
- d->open(url, true);
+ QNetworkRequest request(url);
+ d->open(request, true);
+}
+
+/*!
+ \brief Opens a WebSocket connection using the given \a request.
+ \since 5.6
+
+ The \a request url will be used to open the WebSocket connection.
+ Headers present in the request will be sent to the server in the upgrade
request,
+ together with the ones needed for the websocket handshake.
+ */
+void QWebSocket::open(const QNetworkRequest &request)
+{
+ Q_D(QWebSocket);
+ d->open(request, true);
}
/*!
@@ -514,7 +529,17 @@
QUrl QWebSocket::requestUrl() const
{
Q_D(const QWebSocket);
- return d->requestUrl();
+ return d->request().url();
+}
+
+/*!
+ \brief Returns the request that was or will be used to open this socket.
+ \since 5.6
+ */
+QNetworkRequest QWebSocket::request() const
+{
+ Q_D(const QWebSocket);
+ return d->request();
}
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocket.h
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket.h
--- old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocket.h
2015-10-13 06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket.h
2016-02-15 13:41:23.000000000 +0100
@@ -36,6 +36,7 @@
#include <QtCore/QUrl>
#include <QtNetwork/QAbstractSocket>
+#include <QtNetwork/QNetworkRequest>
#ifndef QT_NO_NETWORKPROXY
#include <QtNetwork/QNetworkProxy>
#endif
@@ -92,6 +93,7 @@
QWebSocketProtocol::Version version() const;
QString resourceName() const;
QUrl requestUrl() const;
+ QNetworkRequest request() const;
QString origin() const;
QWebSocketProtocol::CloseCode closeCode() const;
QString closeReason() const;
@@ -109,6 +111,7 @@
void close(QWebSocketProtocol::CloseCode closeCode =
QWebSocketProtocol::CloseCodeNormal,
const QString &reason = QString());
void open(const QUrl &url);
+ void open(const QNetworkRequest &request);
void ping(const QByteArray &payload = QByteArray());
#ifndef QT_NO_SSL
void ignoreSslErrors();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocket_p.cpp
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket_p.cpp
--- old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocket_p.cpp
2015-10-13 06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket_p.cpp
2016-02-15 13:41:23.000000000 +0100
@@ -88,7 +88,7 @@
m_errorString(),
m_version(version),
m_resourceName(),
- m_requestUrl(),
+ m_request(),
m_origin(origin),
m_protocol(),
m_extension(),
@@ -121,7 +121,7 @@
m_errorString(pTcpSocket->errorString()),
m_version(version),
m_resourceName(),
- m_requestUrl(),
+ m_request(),
m_origin(),
m_protocol(),
m_extension(),
@@ -288,9 +288,15 @@
{
QWebSocket *pWebSocket = new QWebSocket(pTcpSocket,
response.acceptedVersion(), parent);
if (Q_LIKELY(pWebSocket)) {
+ QNetworkRequest netRequest(request.requestUrl());
+ QMapIterator<QString, QString> headerIter(request.headers());
+ while (headerIter.hasNext()) {
+ headerIter.next();
+ netRequest.setRawHeader(headerIter.key().toLatin1(),
headerIter.value().toLatin1());
+ }
pWebSocket->d_func()->setExtension(response.acceptedExtension());
pWebSocket->d_func()->setOrigin(request.origin());
- pWebSocket->d_func()->setRequestUrl(request.requestUrl());
+ pWebSocket->d_func()->setRequest(netRequest);
pWebSocket->d_func()->setProtocol(response.acceptedProtocol());
pWebSocket->d_func()->setResourceName(request.requestUrl().toString(QUrl::RemoveUserInfo));
//a server should not send masked frames
@@ -337,12 +343,13 @@
/*!
\internal
*/
-void QWebSocketPrivate::open(const QUrl &url, bool mask)
+void QWebSocketPrivate::open(const QNetworkRequest &request, bool mask)
{
//just delete the old socket for the moment;
//later, we can add more 'intelligent' handling by looking at the URL
Q_Q(QWebSocket);
+ QUrl url = request.url();
if (!url.isValid() || url.toString().contains(QStringLiteral("\r\n"))) {
setErrorString(QWebSocket::tr("Invalid URL."));
Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError);
@@ -359,11 +366,11 @@
m_isClosingHandshakeReceived = false;
m_isClosingHandshakeSent = false;
- setRequestUrl(url);
+ setRequest(request);
QString resourceName = url.path(QUrl::FullyEncoded);
// Check for encoded \r\n
if (resourceName.contains(QStringLiteral("%0D%0A"))) {
- setRequestUrl(QUrl()); //clear requestUrl
+ setRequest(QNetworkRequest()); //clear request
setErrorString(QWebSocket::tr("Invalid resource name."));
Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError);
return;
@@ -486,10 +493,10 @@
/*!
\internal
*/
-void QWebSocketPrivate::setRequestUrl(const QUrl &requestUrl)
+void QWebSocketPrivate::setRequest(const QNetworkRequest &request)
{
- if (m_requestUrl != requestUrl)
- m_requestUrl = requestUrl;
+ if (m_request != request)
+ m_request = request;
}
/*!
@@ -627,9 +634,9 @@
/*!
\internal
*/
-QUrl QWebSocketPrivate::requestUrl() const
+QNetworkRequest QWebSocketPrivate::request() const
{
- return m_requestUrl;
+ return m_request;
}
/*!
@@ -1046,22 +1053,29 @@
Q_Q(QWebSocket);
QAbstractSocket::SocketState webSocketState = this->state();
int port = 80;
- if (m_requestUrl.scheme() == QStringLiteral("wss"))
+ if (m_request.url().scheme() == QStringLiteral("wss"))
port = 443;
switch (socketState) {
case QAbstractSocket::ConnectedState:
if (webSocketState == QAbstractSocket::ConnectingState) {
m_key = generateKey();
+
+ QList<QPair<QString, QString> > headers;
+ foreach (const QByteArray &key, m_request.rawHeaderList())
+ headers << qMakePair(QString::fromLatin1(key),
+
QString::fromLatin1(m_request.rawHeader(key)));
+
const QString handshake =
createHandShakeRequest(m_resourceName,
- m_requestUrl.host()
+ m_request.url().host()
% QStringLiteral(":")
- %
QString::number(m_requestUrl.port(port)),
+ %
QString::number(m_request.url().port(port)),
origin(),
QString(),
QString(),
- m_key);
+ m_key,
+ headers);
if (handshake.isEmpty()) {
m_pSocket->abort();
Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError);
@@ -1160,7 +1174,8 @@
QString origin,
QString extensions,
QString protocols,
- QByteArray key)
+ QByteArray key,
+ QList<QPair<QString,
QString> > headers)
{
QStringList handshakeRequest;
if (resourceName.contains(QStringLiteral("\r\n"))) {
@@ -1202,6 +1217,12 @@
handshakeRequest << QStringLiteral("Sec-WebSocket-Extensions: ") %
extensions;
if (protocols.length() > 0)
handshakeRequest << QStringLiteral("Sec-WebSocket-Protocol: ") %
protocols;
+
+ QListIterator<QPair<QString, QString> > headerIter(headers);
+ while (headerIter.hasNext()) {
+ const QPair<QString,QString> &header = headerIter.next();
+ handshakeRequest << header.first % QStringLiteral(": ") %
header.second;
+ }
handshakeRequest << QStringLiteral("\r\n");
return handshakeRequest.join(QStringLiteral("\r\n"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocket_p.h
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket_p.h
--- old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocket_p.h
2015-10-13 06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket_p.h
2016-02-15 13:41:23.000000000 +0100
@@ -126,7 +126,7 @@
QWebSocketProtocol::Version version() const;
QString resourceName() const;
- QUrl requestUrl() const;
+ QNetworkRequest request() const;
QString origin() const;
QString protocol() const;
QString extension() const;
@@ -145,7 +145,7 @@
void closeGoingAway();
void close(QWebSocketProtocol::CloseCode closeCode, QString reason);
- void open(const QUrl &url, bool mask);
+ void open(const QNetworkRequest &request, bool mask);
void ping(const QByteArray &payload);
QWebSocket * const q_ptr;
@@ -155,7 +155,7 @@
QWebSocket *pWebSocket);
void setVersion(QWebSocketProtocol::Version version);
void setResourceName(const QString &resourceName);
- void setRequestUrl(const QUrl &requestUrl);
+ void setRequest(const QNetworkRequest &request);
void setOrigin(const QString &origin);
void setProtocol(const QString &protocol);
void setExtension(const QString &extension);
@@ -185,7 +185,8 @@
QString origin,
QString extensions,
QString protocols,
- QByteArray key);
+ QByteArray key,
+ QList<QPair<QString, QString> > headers);
static QWebSocket *upgradeFrom(QTcpSocket *tcpSocket,
const QWebSocketHandshakeRequest &request,
@@ -202,7 +203,7 @@
QWebSocketProtocol::Version m_version;
QUrl m_resource;
QString m_resourceName;
- QUrl m_requestUrl;
+ QNetworkRequest m_request;
QString m_origin;
QString m_protocol;
QString m_extension;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocketframe.cpp
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketframe.cpp
--- old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocketframe.cpp
2015-10-13 06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketframe.cpp
2016-02-15 13:41:23.000000000 +0100
@@ -61,14 +61,14 @@
QWebSocketFrame::QWebSocketFrame() :
m_closeCode(QWebSocketProtocol::CloseCodeNormal),
m_closeReason(),
- m_isFinalFrame(true),
m_mask(0),
- m_rsv1(0),
- m_rsv2(0),
- m_rsv3(0),
m_opCode(QWebSocketProtocol::OpCodeReservedC),
m_length(0),
m_payload(),
+ m_isFinalFrame(true),
+ m_rsv1(false),
+ m_rsv2(false),
+ m_rsv3(false),
m_isValid(false)
{
}
@@ -79,14 +79,14 @@
QWebSocketFrame::QWebSocketFrame(const QWebSocketFrame &other) :
m_closeCode(other.m_closeCode),
m_closeReason(other.m_closeReason),
- m_isFinalFrame(other.m_isFinalFrame),
m_mask(other.m_mask),
- m_rsv1(other.m_rsv1),
- m_rsv2(other.m_rsv2),
- m_rsv3(other.m_rsv3),
m_opCode(other.m_opCode),
m_length(other.m_length),
m_payload(other.m_payload),
+ m_isFinalFrame(other.m_isFinalFrame),
+ m_rsv1(other.m_rsv1),
+ m_rsv2(other.m_rsv2),
+ m_rsv3(other.m_rsv3),
m_isValid(other.m_isValid)
{
}
@@ -118,14 +118,14 @@
QWebSocketFrame::QWebSocketFrame(QWebSocketFrame &&other) :
m_closeCode(qMove(other.m_closeCode)),
m_closeReason(qMove(other.m_closeReason)),
- m_isFinalFrame(qMove(other.m_isFinalFrame)),
m_mask(qMove(other.m_mask)),
- m_rsv1(qMove(other.m_rsv1)),
- m_rsv2(qMove(other.m_rsv2)),
- m_rsv3(qMove(other.m_rsv3)),
m_opCode(qMove(other.m_opCode)),
m_length(qMove(other.m_length)),
m_payload(qMove(other.m_payload)),
+ m_isFinalFrame(qMove(other.m_isFinalFrame)),
+ m_rsv1(qMove(other.m_rsv1)),
+ m_rsv2(qMove(other.m_rsv2)),
+ m_rsv3(qMove(other.m_rsv3)),
m_isValid(qMove(other.m_isValid))
{}
@@ -239,30 +239,6 @@
/*!
\internal
*/
-int QWebSocketFrame::rsv1() const
-{
- return m_rsv1;
-}
-
-/*!
- \internal
- */
-int QWebSocketFrame::rsv2() const
-{
- return m_rsv2;
-}
-
-/*!
- \internal
- */
-int QWebSocketFrame::rsv3() const
-{
- return m_rsv3;
-}
-
-/*!
- \internal
- */
QWebSocketProtocol::OpCode QWebSocketFrame::opCode() const
{
return m_opCode;
@@ -287,9 +263,9 @@
m_closeReason.clear();
m_isFinalFrame = true;
m_mask = 0;
- m_rsv1 = 0;
- m_rsv2 = 0;
- m_rsv3 = 0;
+ m_rsv1 = false;
+ m_rsv2 = false;
+ m_rsv3 = false;
m_opCode = QWebSocketProtocol::OpCodeReservedC;
m_length = 0;
m_payload.clear();
@@ -546,10 +522,10 @@
} else if (isControlFrame()) {
if (Q_UNLIKELY(m_length > 125)) {
setError(QWebSocketProtocol::CloseCodeProtocolError,
- tr("Controle frame is larger than 125 bytes"));
+ tr("Control frame is larger than 125 bytes"));
} else if (Q_UNLIKELY(!m_isFinalFrame)) {
setError(QWebSocketProtocol::CloseCodeProtocolError,
- tr("Controle frames cannot be fragmented"));
+ tr("Control frames cannot be fragmented"));
} else {
m_isValid = true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocketframe_p.h
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketframe_p.h
--- old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocketframe_p.h
2015-10-13 06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketframe_p.h
2016-02-15 13:41:23.000000000 +0100
@@ -34,6 +34,17 @@
#ifndef QWEBSOCKETFRAME_P_H
#define QWEBSOCKETFRAME_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QtCore/QString>
#include <QtCore/QByteArray>
#include <QtCore/QCoreApplication>
@@ -75,9 +86,9 @@
bool isContinuationFrame() const;
bool hasMask() const;
quint32 mask() const; //returns 0 if no mask
- int rsv1() const;
- int rsv2() const;
- int rsv3() const;
+ inline bool rsv1() const { return m_rsv1; }
+ inline bool rsv2() const { return m_rsv2; }
+ inline bool rsv3() const { return m_rsv3; }
QWebSocketProtocol::OpCode opCode() const;
QByteArray payload() const;
@@ -90,16 +101,15 @@
private:
QWebSocketProtocol::CloseCode m_closeCode;
QString m_closeReason;
- bool m_isFinalFrame;
quint32 m_mask;
- int m_rsv1;
- int m_rsv2;
- int m_rsv3;
QWebSocketProtocol::OpCode m_opCode;
-
quint8 m_length;
QByteArray m_payload;
+ bool m_isFinalFrame;
+ bool m_rsv1;
+ bool m_rsv2;
+ bool m_rsv3;
bool m_isValid;
enum ProcessingState
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsockethandshakeresponse.cpp
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsockethandshakeresponse.cpp
---
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsockethandshakeresponse.cpp
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsockethandshakeresponse.cpp
2016-02-15 13:41:23.000000000 +0100
@@ -201,7 +201,7 @@
if (Q_UNLIKELY(!m_canUpgrade)) {
response << QStringLiteral("HTTP/1.1 400 Bad Request");
QStringList versions;
- Q_FOREACH (const QWebSocketProtocol::Version &version,
supportedVersions)
+ Q_FOREACH (QWebSocketProtocol::Version version, supportedVersions)
versions << QString::number(static_cast<int>(version));
response << QStringLiteral("Sec-WebSocket-Version: ")
% versions.join(QStringLiteral(", "));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocketprotocol_p.h
new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketprotocol_p.h
--- old/qtwebsockets-opensource-src-5.5.1/src/websockets/qwebsocketprotocol_p.h
2015-10-13 06:37:55.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketprotocol_p.h
2016-02-15 13:41:23.000000000 +0100
@@ -34,6 +34,17 @@
#ifndef QWEBSOCKETPROTOCOL_P_H
#define QWEBSOCKETPROTOCOL_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QtCore/qglobal.h>
#include "QtWebSockets/qwebsocketprotocol.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp
new/qtwebsockets-opensource-src-5.6.0/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp
---
old/qtwebsockets-opensource-src-5.5.1/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/tests/auto/websockets/dataprocessor/tst_dataprocessor.cpp
2016-02-15 13:41:23.000000000 +0100
@@ -329,7 +329,7 @@
//error C2308: concatenating mismatched strings
QTest::newRow((QStringLiteral("Text frame containing Hello-") +
QStringLiteral("\xC2\xB5\x40\xC3\x9F\xC3\xB6\xC3\xA4\xC3\xBC\xC3\xA0") +
- QStringLiteral("\xC3\xA1-UTF-8!!")).toLatin1().constData())
+ QStringLiteral("\xC3\xA1-UTF-8!!")).toUtf8().constData())
<<
QByteArray::fromHex("48656c6c6f2dc2b540c39fc3b6c3a4c3bcc3a0c3a12d5554462d382121")
<< 22;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/tests/auto/websockets/handshakerequest/tst_handshakerequest.cpp
new/qtwebsockets-opensource-src-5.6.0/tests/auto/websockets/handshakerequest/tst_handshakerequest.cpp
---
old/qtwebsockets-opensource-src-5.5.1/tests/auto/websockets/handshakerequest/tst_handshakerequest.cpp
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/tests/auto/websockets/handshakerequest/tst_handshakerequest.cpp
2016-02-15 13:41:23.000000000 +0100
@@ -330,7 +330,7 @@
//a headerline should not be larger than MAX_HEADERLINE_LENGTH characters
(excluding CRLF)
QString illegalHeader = header;
- illegalHeader.append(QString(MAX_HEADERLINE_LENGTH + 1,
QChar::fromAscii('c')));
+ illegalHeader.append(QString(MAX_HEADERLINE_LENGTH + 1, QLatin1Char('c')));
illegalHeader.append(QStringLiteral("\r\n\r\n"));
QTest::newRow("headerline too long") << illegalHeader << false;
@@ -338,7 +338,7 @@
QString legalHeader = header;
const QString headerKey = QStringLiteral("X-CUSTOM-KEY: ");
legalHeader.append(headerKey);
- legalHeader.append(QString(MAX_HEADERLINE_LENGTH - headerKey.length(),
QChar::fromAscii('c')));
+ legalHeader.append(QString(MAX_HEADERLINE_LENGTH - headerKey.length(),
QLatin1Char('c')));
legalHeader.append(QStringLiteral("\r\n\r\n"));
QTest::newRow("headerline with maximum length") << legalHeader << true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
new/qtwebsockets-opensource-src-5.6.0/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
---
old/qtwebsockets-opensource-src-5.5.1/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
2016-02-15 13:41:23.000000000 +0100
@@ -52,6 +52,7 @@
Q_SIGNALS:
void newConnection(QUrl requestUrl);
+ void newConnection(QNetworkRequest request);
private Q_SLOTS:
void onNewConnection();
@@ -87,6 +88,7 @@
QWebSocket *pSocket = m_pWebSocketServer->nextPendingConnection();
Q_EMIT newConnection(pSocket->requestUrl());
+ Q_EMIT newConnection(pSocket->request());
connect(pSocket, SIGNAL(textMessageReceived(QString)), this,
SLOT(processTextMessage(QString)));
connect(pSocket, SIGNAL(binaryMessageReceived(QByteArray)), this,
SLOT(processBinaryMessage(QByteArray)));
@@ -140,6 +142,7 @@
void tst_sendTextMessage();
void tst_sendBinaryMessage();
void tst_errorString();
+ void tst_openRequest();
void tst_moveToThread();
void tst_moveToThreadNoWarning();
#ifndef QT_NO_NETWORKPROXY
@@ -427,11 +430,9 @@
socket.open(url);
- if (socketConnectedSpy.count() == 0)
- QVERIFY(socketConnectedSpy.wait(500));
+ QTRY_COMPARE(socketConnectedSpy.count(), 1);
QCOMPARE(socketError.count(), 0);
QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
- QCOMPARE(serverConnectedSpy.count(), 1);
QList<QVariant> arguments = serverConnectedSpy.takeFirst();
QUrl urlConnected = arguments.at(0).toUrl();
QCOMPARE(urlConnected, url);
@@ -463,8 +464,7 @@
socket.open(QUrl(QStringLiteral("ws://") +
echoServer.hostAddress().toString() +
QStringLiteral(":") +
QString::number(echoServer.port())));
- if (socketConnectedSpy.count() == 0)
- QVERIFY(socketConnectedSpy.wait(500));
+ QTRY_COMPARE(socketConnectedSpy.count(), 1);
QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
socket.sendTextMessage(QStringLiteral("Hello world!"));
@@ -508,8 +508,7 @@
socket.open(QUrl(QStringLiteral("ws://") +
echoServer.hostAddress().toString() +
QStringLiteral(":") +
QString::number(echoServer.port())));
- if (socketConnectedSpy.count() == 0)
- QVERIFY(socketConnectedSpy.wait(500));
+ QTRY_COMPARE(socketConnectedSpy.count(), 1);
QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
socket.sendBinaryMessage(QByteArrayLiteral("Hello world!"));
@@ -539,8 +538,7 @@
socket.open(QUrl(QStringLiteral("ws://") +
echoServer.hostAddress().toString() +
QStringLiteral(":") +
QString::number(echoServer.port())));
- if (socketConnectedSpy.count() == 0)
- QVERIFY(socketConnectedSpy.wait(500));
+ QTRY_COMPARE(socketConnectedSpy.count(), 1);
QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
socket.sendBinaryMessage(QByteArrayLiteral("Hello world!"));
@@ -573,9 +571,7 @@
socket.open(QUrl(QStringLiteral("ws://someserver.on.mars:9999")));
- if (errorSpy.count() == 0)
- errorSpy.wait(500);
- QCOMPARE(errorSpy.count(), 1);
+ QTRY_COMPARE(errorSpy.count(), 1);
QList<QVariant> arguments = errorSpy.takeFirst();
QAbstractSocket::SocketError socketError =
qvariant_cast<QAbstractSocket::SocketError>(arguments.at(0));
@@ -583,6 +579,32 @@
QCOMPARE(socket.errorString(), QStringLiteral("Host not found"));
}
+void tst_QWebSocket::tst_openRequest()
+{
+ EchoServer echoServer;
+
+ QWebSocket socket;
+
+ QSignalSpy socketConnectedSpy(&socket, SIGNAL(connected()));
+ QSignalSpy serverRequestSpy(&echoServer,
SIGNAL(newConnection(QNetworkRequest)));
+
+ QUrl url = QUrl(QStringLiteral("ws://") +
echoServer.hostAddress().toString() +
+ QLatin1Char(':') + QString::number(echoServer.port()));
+ url.addQueryItem("queryitem", "with encoded characters");
+ QNetworkRequest req(url);
+ req.setRawHeader("X-Custom-Header", "A custom header");
+ socket.open(req);
+
+ QTRY_COMPARE(socketConnectedSpy.count(), 1);
+ QTRY_COMPARE(serverRequestSpy.count(), 1);
+ QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
+ QList<QVariant> arguments = serverRequestSpy.takeFirst();
+ QNetworkRequest requestConnected =
arguments.at(0).value<QNetworkRequest>();
+ QCOMPARE(requestConnected.url(), req.url());
+ QCOMPARE(requestConnected.rawHeader("X-Custom-Header"),
req.rawHeader("X-Custom-Header"));
+ socket.close();
+}
+
class WebSocket : public QWebSocket
{
Q_OBJECT
@@ -668,7 +690,7 @@
socket->asyncClose();
- QCOMPARE(timer.isActive(), false);
+ QTRY_COMPARE_WITH_TIMEOUT(loop.isRunning(), false, 200);
QCOMPARE(socket->receivedMessage, textMessage);
socket->deleteLater();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.5.1/tests/auto/websockets/websocketframe/tst_websocketframe.cpp
new/qtwebsockets-opensource-src-5.6.0/tests/auto/websockets/websocketframe/tst_websocketframe.cpp
---
old/qtwebsockets-opensource-src-5.5.1/tests/auto/websockets/websocketframe/tst_websocketframe.cpp
2015-10-13 06:37:55.000000000 +0200
+++
new/qtwebsockets-opensource-src-5.6.0/tests/auto/websockets/websocketframe/tst_websocketframe.cpp
2016-02-15 13:41:23.000000000 +0100
@@ -244,9 +244,9 @@
void tst_WebSocketFrame::tst_goodFrames_data()
{
- QTest::addColumn<int>("rsv1");
- QTest::addColumn<int>("rsv2");
- QTest::addColumn<int>("rsv3");
+ QTest::addColumn<bool>("rsv1");
+ QTest::addColumn<bool>("rsv2");
+ QTest::addColumn<bool>("rsv3");
QTest::addColumn<quint32>("mask");
QTest::addColumn<QWebSocketProtocol::OpCode>("opCode");
QTest::addColumn<bool>("isFinal");
@@ -256,54 +256,54 @@
QTest::addColumn<bool>("isContinuationFrame");
QTest::newRow("Non masked final text frame with small payload")
- << 0 << 0 << 0
+ << false << false << false
<< 0U << QWebSocketProtocol::OpCodeText
<< true << QStringLiteral("Hello world!").toUtf8()
<< false << true << false;
QTest::newRow("Non masked final binary frame with small payload")
- << 0 << 0 << 0
+ << false << false << false
<< 0U << QWebSocketProtocol::OpCodeBinary
<< true << QByteArrayLiteral("\x00\x01\x02\x03\x04")
<< false << true << false;
QTest::newRow("Non masked final text frame with no payload")
- << 0 << 0 << 0
+ << false << false << false
<< 0U << QWebSocketProtocol::OpCodeText
<< true << QByteArray()
<< false << true << false;
QTest::newRow("Non masked final binary frame with no payload")
- << 0 << 0 << 0
+ << false << false << false
<< 0U << QWebSocketProtocol::OpCodeBinary
<< true << QByteArray()
<< false << true << false;
QTest::newRow("Non masked final close frame with small payload")
- << 0 << 0 << 0
+ << false << false << false
<< 0U << QWebSocketProtocol::OpCodeClose
<< true << QStringLiteral("Hello world!").toUtf8()
<< true << false << false;
QTest::newRow("Non masked final close frame with no payload")
- << 0 << 0 << 0
+ << false << false << false
<< 0U << QWebSocketProtocol::OpCodeClose
<< true << QByteArray()
<< true << false << false;
QTest::newRow("Non masked final ping frame with small payload")
- << 0 << 0 << 0
+ << false << false << false
<< 0U << QWebSocketProtocol::OpCodePing
<< true << QStringLiteral("Hello world!").toUtf8()
<< true << false << false;
QTest::newRow("Non masked final pong frame with no payload")
- << 0 << 0 << 0
+ << false << false << false
<< 0U << QWebSocketProtocol::OpCodePong
<< true << QByteArray()
<< true << false << false;
QTest::newRow("Non masked final continuation frame with small payload")
- << 0 << 0 << 0
+ << false << false << false
<< 0U << QWebSocketProtocol::OpCodeContinue
<< true << QStringLiteral("Hello world!").toUtf8()
<< false << true << true;
QTest::newRow("Non masked non-final continuation frame with small payload")
- << 0 << 0 << 0
+ << false << false << false
<< 0U << QWebSocketProtocol::OpCodeContinue
<< false << QStringLiteral("Hello world!").toUtf8()
<< false << true << true;
@@ -311,9 +311,9 @@
void tst_WebSocketFrame::tst_goodFrames()
{
- QFETCH(int, rsv1);
- QFETCH(int, rsv2);
- QFETCH(int, rsv3);
+ QFETCH(bool, rsv1);
+ QFETCH(bool, rsv2);
+ QFETCH(bool, rsv3);
QFETCH(quint32, mask);
QFETCH(QWebSocketProtocol::OpCode, opCode);
QFETCH(bool, isFinal);
