Hello community,
here is the log from the commit of package libqt5-qtwebsockets for
openSUSE:Factory checked in at 2016-06-25 01:55:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-05-17 17:06:13.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new/libqt5-qtwebsockets.changes
2016-06-25 01:55:35.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 8 14:15:24 UTC 2016 - [email protected]
+
+- Update to 5.6.1
+ * For more details please see:
+ http://blog.qt.io/blog/2016/06/08/qt-5-6-1-released/
+
+-------------------------------------------------------------------
Old:
----
qtwebsockets-opensource-src-5.6.0.tar.xz
New:
----
qtwebsockets-opensource-src-5.6.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebsockets.spec ++++++
--- /var/tmp/diff_new_pack.bNPZ4X/_old 2016-06-25 01:55:36.000000000 +0200
+++ /var/tmp/diff_new_pack.bNPZ4X/_new 2016-06-25 01:55:36.000000000 +0200
@@ -21,15 +21,15 @@
%define libname libQt5WebSockets5
Name: libqt5-qtwebsockets
-Version: 5.6.0
+Version: 5.6.1
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.6.0
-%define so_version 5.6.0
+%define real_version 5.6.1
+%define so_version 5.6.1
%define tar_version qtwebsockets-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
++++++ qtwebsockets-opensource-src-5.6.0.tar.xz ->
qtwebsockets-opensource-src-5.6.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-opensource-src-5.6.0/.qmake.conf
new/qtwebsockets-opensource-src-5.6.1/.qmake.conf
--- old/qtwebsockets-opensource-src-5.6.0/.qmake.conf 2016-02-15
13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/.qmake.conf 2016-05-12
12:12:26.000000000 +0200
@@ -1,6 +1,5 @@
load(qt_build_config)
-CONFIG += qt_example_installs
CONFIG += warning_clean
-MODULE_VERSION = 5.6.0
+MODULE_VERSION = 5.6.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebsockets-opensource-src-5.6.0/.tag
new/qtwebsockets-opensource-src-5.6.1/.tag
--- old/qtwebsockets-opensource-src-5.6.0/.tag 2016-02-15 13:41:23.000000000
+0100
+++ new/qtwebsockets-opensource-src-5.6.1/.tag 2016-05-12 12:12:26.000000000
+0200
@@ -1 +1 @@
-88946bbe209cb6148b4a3284077bb9a06c7bc1ef
+0637eb3f40440f90eb531561e26f3854463bdbb3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/echoclient/echoclient.pro
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/echoclient/echoclient.pro
---
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/echoclient/echoclient.pro
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/echoclient/echoclient.pro
2016-05-12 12:12:26.000000000 +0200
@@ -13,3 +13,6 @@
HEADERS += \
echoclient.h
+
+target.path = $$[QT_INSTALL_EXAMPLES]/websockets/echoclient
+INSTALLS += target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/echoserver/echoserver.pro
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/echoserver/echoserver.pro
---
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/echoserver/echoserver.pro
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/echoserver/echoserver.pro
2016-05-12 12:12:26.000000000 +0200
@@ -14,4 +14,7 @@
HEADERS += \
echoserver.h
-OTHER_FILES += echoclient.html
+EXAMPLE_FILES += echoclient.html
+
+target.path = $$[QT_INSTALL_EXAMPLES]/websockets/echoserver
+INSTALLS += target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
---
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro
2016-05-12 12:12:26.000000000 +0200
@@ -11,3 +11,6 @@
RESOURCES += data.qrc
OTHER_FILES += qml/qmlwebsocketclient/main.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/websockets/qmlwebsocketclient
+INSTALLS += target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro
---
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro
2016-05-12 12:12:26.000000000 +0200
@@ -11,3 +11,6 @@
RESOURCES += data.qrc
OTHER_FILES += qml/qmlwebsocketserver/main.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/websockets/qmlwebsocketserver
+INSTALLS += target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/simplechat/simplechat.pro
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/simplechat/simplechat.pro
---
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/simplechat/simplechat.pro
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/simplechat/simplechat.pro
2016-05-12 12:12:26.000000000 +0200
@@ -14,4 +14,7 @@
HEADERS += \
chatserver.h
-OTHER_FILES += *.html
+EXAMPLE_FILES += chatclient.html
+
+target.path = $$[QT_INSTALL_EXAMPLES]/websockets/simplechat
+INSTALLS += target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/sslechoclient/sslechoclient.pro
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/sslechoclient/sslechoclient.pro
---
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/sslechoclient/sslechoclient.pro
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/sslechoclient/sslechoclient.pro
2016-05-12 12:12:26.000000000 +0200
@@ -13,3 +13,6 @@
HEADERS += \
sslechoclient.h
+
+target.path = $$[QT_INSTALL_EXAMPLES]/websockets/sslechoclient
+INSTALLS += target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/sslechoserver/sslechoserver.pro
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/sslechoserver/sslechoserver.pro
---
old/qtwebsockets-opensource-src-5.6.0/examples/websockets/sslechoserver/sslechoserver.pro
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/examples/websockets/sslechoserver/sslechoserver.pro
2016-05-12 12:12:26.000000000 +0200
@@ -14,6 +14,9 @@
HEADERS += \
sslechoserver.h
-OTHER_FILES += sslechoclient.html
+EXAMPLE_FILES += sslechoclient.html
RESOURCES += securesocketclient.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/websockets/sslechoserver
+INSTALLS += target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qdefaultmaskgenerator_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qdefaultmaskgenerator_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qdefaultmaskgenerator_p.h
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/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.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qsslserver_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qsslserver_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qsslserver_p.h
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/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.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocket_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocket_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocket_p.h
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/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.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/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.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketdataprocessor_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketdataprocessor_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketdataprocessor_p.h
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/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.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketframe_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketframe_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketframe_p.h
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/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.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakerequest_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakerequest_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakerequest_p.h
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/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.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/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.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketprotocol_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketprotocol_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketprotocol_p.h
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/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.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketserver_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketserver_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.0/QtWebSockets/private/qwebsocketserver_p.h
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.0/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.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qsslserver_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qsslserver_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qsslserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qsslserver_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qsslserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocket_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocket_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocket_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocket_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketframe_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketframe_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketframe_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketframe_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketframe_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketprotocol_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketprotocol_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketprotocol_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketprotocol_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketprotocol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketserver_p.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketserver_p.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketserver_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/5.6.1/QtWebSockets/private/qwebsocketserver_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/qtwebsocketsversion.h
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/qtwebsocketsversion.h
---
old/qtwebsockets-opensource-src-5.6.0/include/QtWebSockets/qtwebsocketsversion.h
2016-03-13 17:25:48.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/include/QtWebSockets/qtwebsocketsversion.h
2016-06-02 09:03:58.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTWEBSOCKETS_VERSION_H
#define QT_QTWEBSOCKETS_VERSION_H
-#define QTWEBSOCKETS_VERSION_STR "5.6.0"
+#define QTWEBSOCKETS_VERSION_STR "5.6.1"
-#define QTWEBSOCKETS_VERSION 0x050600
+#define QTWEBSOCKETS_VERSION 0x050601
#endif // QT_QTWEBSOCKETS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/imports/qmlwebsockets/qqmlwebsocket.cpp
new/qtwebsockets-opensource-src-5.6.1/src/imports/qmlwebsockets/qqmlwebsocket.cpp
---
old/qtwebsockets-opensource-src-5.6.0/src/imports/qmlwebsockets/qqmlwebsocket.cpp
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/src/imports/qmlwebsockets/qqmlwebsocket.cpp
2016-05-12 12:12:26.000000000 +0200
@@ -42,8 +42,7 @@
WebSockets is a web technology providing full-duplex communications
channels over a
single TCP connection.
- The WebSocket protocol was standardized by the IETF as
- \l {http://tools.ietf.org/html/rfc6455} {RFC 6455} in 2011.
+ The WebSocket protocol was standardized by the IETF as \l {RFC 6455} in
2011.
*/
/*!
@@ -87,9 +86,9 @@
/*!
\qmlsignal WebSocket::statusChanged(Status status)
This signal is emitted when the status of the WebSocket changes.
- the \l {WebSocket::status}{status} argument provides the current status.
+ the \l [QML]{WebSocket::status}{status} argument provides the current status.
- \sa WebSocket::status
+ \sa {QtWebSockets::}{WebSocket::status}
*/
/*!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp
new/qtwebsockets-opensource-src-5.6.1/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp
---
old/qtwebsockets-opensource-src-5.6.0/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp
2016-05-12 12:12:26.000000000 +0200
@@ -90,7 +90,7 @@
/*!
\qmlsignal WebSocketServer::clientConnected(WebSocket webSocket)
- This signal is emitted when a client connects to this server.
+ This signal is emitted when a client connects to this server. \a webSocket
is the newly created \l [QML]{WebSocket}.
*/
QQmlWebSocketServer::QQmlWebSocketServer(QObject *parent)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/qtwebsockets.qdocconf
new/qtwebsockets-opensource-src-5.6.1/src/websockets/doc/qtwebsockets.qdocconf
---
old/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/qtwebsockets.qdocconf
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/src/websockets/doc/qtwebsockets.qdocconf
2016-05-12 12:12:26.000000000 +0200
@@ -4,7 +4,7 @@
description = Qt WebSockets Reference
Documentation
version = $QT_VERSION
-examplesinstallpath = qtwebsockets/websockets
+examplesinstallpath = websockets
qhp.projects = QtWebSockets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/src/external-resources.qdoc
new/qtwebsockets-opensource-src-5.6.1/src/websockets/doc/src/external-resources.qdoc
---
old/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/src/external-resources.qdoc
1970-01-01 01:00:00.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/src/websockets/doc/src/external-resources.qdoc
2016-05-12 12:12:26.000000000 +0200
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** 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.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** 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.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \externalpage http://w2spconf.com/2011/papers/websocket.pdf
+ \title "Talking to Yourself for Fun and Profit" by Lin-Shung Huang et al
+*/
+
+/*!
+ \externalpage http://tools.ietf.org/html/rfc6454
+ \title RFC 6454
+*/
+
+/*!
+ \externalpage http://tools.ietf.org/html/rfc6455
+ \title RFC 6455
+*/
+
+/*!
+ \externalpage http://tools.ietf.org/html/rfc6455#section-10
+ \title WebSocket Security Considerations
+*/
+
+/*!
+ \externalpage http://tools.ietf.org/html/rfc6455#page-39
+ \title WebSocket Extensions
+*/
+
+/*!
+ \externalpage http://tools.ietf.org/html/rfc6455#page-12
+ \title WebSocket Subprotocols
+*/
+
+/*!
+ \externalpage
http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
+ \title hixie76
+*/
+
+/*!
+ \externalpage
http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00
+ \title hybi-00
+*/
+
+/*!
+ \externalpage
http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-04.txt
+ \title hybi-04
+*/
+
+/*!
+ \externalpage
http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-05.txt
+ \title hybi-05
+*/
+
+/*!
+ \externalpage
http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
+ \title hybi-07
+*/
+
+/*!
+ \externalpage
https://github.com/google/pywebsocket/wiki/WebSocketProtocolSpec
+ \title pywebsocket's WebSocketProtocolSpec
+*/
+
+/*!
+ \externalpage http://autobahn.ws/testsuite/
+ \title Autobahn|Testsuite
+*/
+
+/*!
+ \externalpage http://autobahn.ws/testsuite/installation.html
+ \title Autobahn|Testsuite installation documentation
+*/
+
+/*!
+ \externalpage https://www.mozilla.org/firefox
+ \title Firefox
+*/
+
+/*!
+ \externalpage https://bugzilla.mozilla.org/show_bug.cgi?id=594502
+ \title Firefox bug 594502
+
+/*
+ This prevents autolinking of each occurrence of 'WebSocket'
+ To link to the WebSocket QML type, use explicit linking:
+ \l [QML] WebSocket
+ \sa {QtWebSockets::}{WebSocket}
+*/
+/*!
+ \externalpage nolink
+ \title WebSocket
+ \internal
+*/
+
+/*
+ Prevent linking to WebSockets section in "Networking and Connectivity"
+*/
+/*!
+ \externalpage nolink
+ \title WebSockets
+ \internal
+*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/src/index.qdoc
new/qtwebsockets-opensource-src-5.6.1/src/websockets/doc/src/index.qdoc
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/src/index.qdoc
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/doc/src/index.qdoc
2016-05-12 12:12:26.000000000 +0200
@@ -77,10 +77,10 @@
\page qtwebsockets-testing.html
\title Testing Qt WebSockets
- \l {http://autobahn.ws/testsuite/}{Autobahn|Testsuite}, a standard test
- suite for WebSocket Protocol (RFC 6455), can be used for testing the
- conformance of Qt WebSockets. Refer to Autobahn|Testsuite
- \l {http://autobahn.ws/testsuite/installation.html}{installation
documentation}
+ \l {Autobahn|Testsuite}, a standard test
+ suite for WebSocket Protocol (\l{RFC 6455}), can be used for testing the
+ conformance of Qt WebSockets. Refer to
+ \l {Autobahn|Testsuite installation documentation}
to set up the test suite.
\include README testsuite
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/src/overview.qdoc
new/qtwebsockets-opensource-src-5.6.1/src/websockets/doc/src/overview.qdoc
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/doc/src/overview.qdoc
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/doc/src/overview.qdoc
2016-05-12 12:12:26.000000000 +0200
@@ -106,6 +106,6 @@
\section2 Related Information
\list
-\li \l {http://tools.ietf.org/html/rfc6455}{WebSocket RFC 6455}
+\li \l{RFC 6455}
\endlist
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qdefaultmaskgenerator_p.cpp
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qdefaultmaskgenerator_p.cpp
---
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qdefaultmaskgenerator_p.cpp
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qdefaultmaskgenerator_p.cpp
2016-05-12 12:12:26.000000000 +0200
@@ -37,11 +37,11 @@
\brief The QDefaultMaskGenerator class provides the default mask generator
for QtWebSockets.
- The WebSockets specification as outlined in
{http://tools.ietf.org/html/rfc6455}{RFC 6455}
+ The WebSockets specification as outlined in \l {RFC 6455}
requires that all communication from client to server must be masked. This
is to prevent
malicious scripts to attack bad behaving proxies.
For more information about the importance of good masking,
- see \l {http://w2spconf.com/2011/papers/websocket.pdf}.
+ see \l {"Talking to Yourself for Fun and Profit" by Lin-Shung Huang et al}.
The default mask generator uses the cryptographically insecure qrand()
function.
The best measure against attacks mentioned in the document above,
is to use QWebSocket over a secure connection (\e wss://).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qmaskgenerator.cpp
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qmaskgenerator.cpp
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/qmaskgenerator.cpp
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/qmaskgenerator.cpp
2016-05-12 12:12:26.000000000 +0200
@@ -39,11 +39,11 @@
\brief The QMaskGenerator class provides an abstract base for custom
32-bit mask generators.
- The WebSockets specification as outlined in \l
{http://tools.ietf.org/html/rfc6455}{RFC 6455}
+ The WebSockets specification as outlined in \l {RFC 6455}
requires that all communication from client to server be masked. This is
to prevent
malicious scripts from attacking badly behaving proxies.
For more information about the importance of good masking,
- see \l {http://w2spconf.com/2011/papers/websocket.pdf}.
+ see \l {"Talking to Yourself for Fun and Profit" by Lin-Shung Huang et al}.
By default QWebSocket uses the cryptographically insecure qrand() function.
The best measure against attacks mentioned in the document above,
is to use QWebSocket over a secure connection (\e wss://).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qmaskgenerator.h
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qmaskgenerator.h
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/qmaskgenerator.h
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/qmaskgenerator.h
2016-05-12 12:12:26.000000000 +0200
@@ -44,7 +44,7 @@
Q_DISABLE_COPY(QMaskGenerator)
public:
- explicit QMaskGenerator(QObject *parent = 0);
+ explicit QMaskGenerator(QObject *parent = Q_NULLPTR);
virtual ~QMaskGenerator();
virtual bool seed() = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket.cpp
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocket.cpp
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket.cpp
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocket.cpp
2016-05-12 12:12:26.000000000 +0200
@@ -41,17 +41,17 @@
WebSockets is a web technology providing full-duplex communications
channels over
a single TCP connection.
The WebSocket protocol was standardized by the IETF as
- \l {http://tools.ietf.org/html/rfc6455} {RFC 6455} in 2011.
+ \l {RFC 6455} in 2011.
QWebSocket can both be used in a client application and server application.
This class was modeled after QAbstractSocket.
QWebSocket currently does not support
- \l {http://tools.ietf.org/html/rfc6455#page-39} {extensions} and
- \l {http://tools.ietf.org/html/rfc6455#page-12} {subprotocols}.
+ \l {WebSocket Extensions} and
+ \l {WebSocket Subprotocols}.
QWebSocket only supports version 13 of the WebSocket protocol, as outlined
in
- \l {http://tools.ietf.org/html/rfc6455}{RFC 6455}.
+ \l {RFC 6455}.
\note Some proxies do not understand certain HTTP headers used during a
WebSocket handshake.
In that case, non-secure WebSocket connections fail. The best way to
mitigate against
@@ -60,7 +60,7 @@
\warning To generate masks, this implementation of WebSockets uses the
cryptographically
insecure qrand() function.
For more information about the importance of good masking,
- see \l {http://w2spconf.com/2011/papers/websocket.pdf}.
+ see \l {"Talking to Yourself for Fun and Profit" by Lin-Shung Huang et al}.
The best measure against attacks mentioned in the document above,
is to use QWebSocket over a secure connection (\e wss://).
In general, always be careful to not have 3rd party script access to
@@ -259,12 +259,12 @@
* \brief Creates a new QWebSocket with the given \a origin,
* the \a version of the protocol to use and \a parent.
*
- * The \a origin of the client is as specified in \l
{http://tools.ietf.org/html/rfc6454}{RFC 6454}.
+ * The \a origin of the client is as specified in \l {RFC 6454}.
* (The \a origin is not required for non-web browser clients
- * (see \l {http://tools.ietf.org/html/rfc6455}{RFC 6455})).
+ * (see \l {RFC 6455})).
* The \a origin may not contain new line characters, otherwise the connection
will be
* aborted immediately during the handshake phase.
- * \note Currently only V13 (\l {http://tools.ietf.org/html/rfc6455} {RFC
6455}) is supported
+ * \note Currently only V13 (\l {RFC 6455}) is supported
*/
QWebSocket::QWebSocket(const QString &origin,
QWebSocketProtocol::Version version,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket.h
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocket.h
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket.h
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocket.h
2016-05-12 12:12:26.000000000 +0200
@@ -62,7 +62,7 @@
public:
explicit QWebSocket(const QString &origin = QString(),
QWebSocketProtocol::Version version =
QWebSocketProtocol::VersionLatest,
- QObject *parent = 0);
+ QObject *parent = Q_NULLPTR);
virtual ~QWebSocket();
void abort();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket_p.cpp
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocket_p.cpp
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket_p.cpp
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocket_p.cpp
2016-05-12 12:12:26.000000000 +0200
@@ -275,6 +275,15 @@
}
}
+/*!
+* \internal
+*/
+void QWebSocketPrivate::_q_updateSslConfiguration()
+{
+ if (QSslSocket *sslSock = qobject_cast<QSslSocket *>(m_pSocket))
+ m_configuration.m_sslConfiguration = sslSock->sslConfiguration();
+}
+
#endif
/*!
@@ -294,6 +303,10 @@
headerIter.next();
netRequest.setRawHeader(headerIter.key().toLatin1(),
headerIter.value().toLatin1());
}
+#ifndef QT_NO_SSL
+ if (QSslSocket *sslSock = qobject_cast<QSslSocket *>(pTcpSocket))
+ pWebSocket->setSslConfiguration(sslSock->sslConfiguration());
+#endif
pWebSocket->d_func()->setExtension(response.acceptedExtension());
pWebSocket->d_func()->setOrigin(request.origin());
pWebSocket->d_func()->setRequest(netRequest);
@@ -579,6 +592,8 @@
QObject::connect(sslSocket,
static_cast<sslErrorSignalType>(&QSslSocket::sslErrors),
q, &QWebSocket::sslErrors);
+ QObjectPrivate::connect(sslSocket, &QSslSocket::encrypted,
+ this,
&QWebSocketPrivate::_q_updateSslConfiguration);
} else
#endif // QT_NO_SSL
{
@@ -1058,6 +1073,10 @@
switch (socketState) {
case QAbstractSocket::ConnectedState:
+#ifndef QT_NO_SSL
+ if (QSslSocket *sslSock = qobject_cast<QSslSocket *>(m_pSocket))
+ m_configuration.m_sslConfiguration = sslSock->sslConfiguration();
+#endif
if (webSocketState == QAbstractSocket::ConnectingState) {
m_key = generateKey();
@@ -1123,10 +1142,13 @@
{
Q_ASSERT(m_pSocket);
while (m_pSocket->bytesAvailable()) {
- if (state() == QAbstractSocket::ConnectingState)
+ if (state() == QAbstractSocket::ConnectingState) {
+ if (!m_pSocket->canReadLine())
+ break;
processHandshake(m_pSocket);
- else
+ } else {
m_dataProcessor.process(m_pSocket);
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket_p.h
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocket_p.h
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocket_p.h
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocket_p.h
2016-05-12 12:12:26.000000000 +0200
@@ -141,6 +141,7 @@
void ignoreSslErrors();
void setSslConfiguration(const QSslConfiguration &sslConfiguration);
QSslConfiguration sslConfiguration() const;
+ void _q_updateSslConfiguration();
#endif
void closeGoingAway();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketcorsauthenticator.cpp
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocketcorsauthenticator.cpp
---
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketcorsauthenticator.cpp
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocketcorsauthenticator.cpp
2016-05-12 12:12:26.000000000 +0200
@@ -53,7 +53,7 @@
\note Checking on the origin does not make much sense when the server is
accessed
via a non-browser client, as that client can set whatever origin header it
likes.
In case of a browser client, the server SHOULD check the validity of the
origin.
- \sa http://tools.ietf.org/html/rfc6455#section-10
+ \sa {WebSocket Security Considerations}
\sa QWebSocketServer
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketdataprocessor.cpp
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocketdataprocessor.cpp
---
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketdataprocessor.cpp
2016-02-15 13:41:23.000000000 +0100
+++
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocketdataprocessor.cpp
2016-05-12 12:12:26.000000000 +0200
@@ -34,7 +34,7 @@
\class QWebSocketDataProcessor
The class QWebSocketDataProcessor is responsible for reading, validating
and
interpreting data from a WebSocket.
- It reads data from a QIODevice, validates it against RFC 6455, and parses
it into
+ It reads data from a QIODevice, validates it against \l{RFC 6455}, and
parses it into
frames (data, control).
It emits signals that correspond to the type of the frame:
textFrameReceived(),
binaryFrameReceived(), textMessageReceived(), binaryMessageReceived(),
pingReceived(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketprotocol.cpp
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocketprotocol.cpp
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketprotocol.cpp
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocketprotocol.cpp
2016-05-12 12:12:26.000000000 +0200
@@ -76,40 +76,34 @@
\brief The different defined versions of the WebSocket protocol.
For an overview of the differences between the different protocols, see
- <http://code.google.com/p/pywebsocket/wiki/WebSocketProtocolSpec>
+ \l {pywebsocket's WebSocketProtocolSpec}.
\value VersionUnknown Unknown or unspecified version.
- \value Version0 hixie76:
-
http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76 &
- hybi-00:
-
http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00.
+ \value Version0 \l{hixie76} and \l{hybi-00}.
Works with key1, key2 and a key in the payload.
Attribute: Sec-WebSocket-Draft value 0.
Not supported by QtWebSockets.
- \value Version4 hybi-04:
-
http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-04.txt.
+ \value Version4 \l{hybi-04}.
Changed handshake: key1, key2, key3
==> Sec-WebSocket-Key, Sec-WebSocket-Nonce,
Sec-WebSocket-Accept
Sec-WebSocket-Draft renamed to
Sec-WebSocket-Version
Sec-WebSocket-Version = 4.
Not supported by QtWebSockets.
- \value Version5 hybi-05:
-
http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-05.txt.
+ \value Version5 \l{hybi-05}.
Sec-WebSocket-Version = 5
Removed Sec-WebSocket-Nonce
Added Sec-WebSocket-Accept.
Not supported by QtWebSockets.
\value Version6 Sec-WebSocket-Version = 6.
Not supported by QtWebSockets.
- \value Version7 hybi-07:
-
http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07.
+ \value Version7 \l{hybi-07}.
Sec-WebSocket-Version = 7.
Not supported by QtWebSockets.
\value Version8 hybi-8, hybi-9, hybi-10, hybi-11 and hybi-12.
Status codes 1005 and 1006 are added and all codes
are now unsigned
Internal error results in 1006.
Not supported by QtWebSockets.
- \value Version13 hybi-13, hybi14, hybi-15, hybi-16, hybi-17 and RFC
6455.
+ \value Version13 hybi-13, hybi14, hybi-15, hybi-16, hybi-17 and
\l{RFC 6455}.
Sec-WebSocket-Version = 13
Status code 1004 is now reserved
Added 1008, 1009 and 1010
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketserver.cpp
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocketserver.cpp
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketserver.cpp
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocketserver.cpp
2016-05-12 12:12:26.000000000 +0200
@@ -60,17 +60,16 @@
Calling close() makes QWebSocketServer stop listening for incoming
connections.
QWebSocketServer currently does not support
- \l {http://tools.ietf.org/html/rfc6455#page-39} {extensions} and
- \l {http://tools.ietf.org/html/rfc6455#page-12} {subprotocols}.
+ \l {WebSocket Extensions} and
+ \l {WebSocket Subprotocols}.
- \note When working with self-signed certificates, FireFox currently has a
- \l {https://bugzilla.mozilla.org/show_bug.cgi?id=594502} {bug} that
prevents it to
+ \note When working with self-signed certificates, \l{Firefox bug 594502}
prevents \l{Firefox} to
connect to a secure WebSocket server. To work around this problem, first
browse to the
secure WebSocket server using HTTPS. FireFox will indicate that the
certificate is invalid.
From here on, the certificate can be added to the exceptions. After this,
the secure WebSockets
connection should work.
- QWebSocketServer only supports version 13 of the WebSocket protocol, as
outlined in RFC 6455.
+ QWebSocketServer only supports version 13 of the WebSocket protocol, as
outlined in \l{RFC 6455}.
\sa {WebSocket Server Example}, QWebSocket
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketserver.h
new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocketserver.h
--- old/qtwebsockets-opensource-src-5.6.0/src/websockets/qwebsocketserver.h
2016-02-15 13:41:23.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.6.1/src/websockets/qwebsocketserver.h
2016-05-12 12:12:26.000000000 +0200
@@ -69,7 +69,7 @@
};
explicit QWebSocketServer(const QString &serverName, SslMode secureMode,
- QObject *parent = 0);
+ QObject *parent = Q_NULLPTR);
virtual ~QWebSocketServer();
bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port
= 0);
