Merge remote-tracking branch 'origin/5.10' into dev

 Conflicts:
	src/websockets/qwebsocket_p.cpp
	tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp

Change-Id: I40922fab198a09a3fbba1b2f11b42f2d40e53720

12 files changed, 82 insertions, 61 deletions

diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0
new file mode 100644
index 0000000..9ad0d80
--- /dev/null
+++ b/dist/changes-5.10.0
@@ -0,0 +1,22 @@
+Qt 5.10 introduces many new features and improvements as well as bugfixes
+over the 5.9.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.10 series is binary compatible with the 5.9.x series.
+Applications compiled for 5.9 will continue to run with 5.10.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                               Qt 5.10.0 Changes                          *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/src/websockets/doc/snippets/src_websockets_ssl_qwebsocket.cpp b/src/websockets/doc/snippets/src_websockets_ssl_qwebsocket.cpp
index 9ce9ef0..78874a3 100644
--- a/src/websockets/doc/snippets/src_websockets_ssl_qwebsocket.cpp
+++ b/src/websockets/doc/snippets/src_websockets_ssl_qwebsocket.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Kurt Pattyn <pattyn.kurt@gmail.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/websockets/doc/src/external-resources.qdoc b/src/websockets/doc/src/external-resources.qdoc
index 933ef7f..40e4257 100644
--- a/src/websockets/doc/src/external-resources.qdoc
+++ b/src/websockets/doc/src/external-resources.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/websockets/doc/src/index.qdoc b/src/websockets/doc/src/index.qdoc
index 4f25589..919e2fc 100644
--- a/src/websockets/doc/src/index.qdoc
+++ b/src/websockets/doc/src/index.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Kurt Pattyn <pattyn.kurt@gmail.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/websockets/doc/src/overview.qdoc b/src/websockets/doc/src/overview.qdoc
index e85461a..48a790f 100644
--- a/src/websockets/doc/src/overview.qdoc
+++ b/src/websockets/doc/src/overview.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/websockets/doc/src/qtwebsockets-module.qdoc b/src/websockets/doc/src/qtwebsockets-module.qdoc
index 971e22c..c1f7958 100644
--- a/src/websockets/doc/src/qtwebsockets-module.qdoc
+++ b/src/websockets/doc/src/qtwebsockets-module.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Kurt Pattyn <pattyn.kurt@gmail.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/websockets/qdefaultmaskgenerator_p.cpp b/src/websockets/qdefaultmaskgenerator_p.cpp
index 7dc0cee..7763868 100644
--- a/src/websockets/qdefaultmaskgenerator_p.cpp
+++ b/src/websockets/qdefaultmaskgenerator_p.cpp
@@ -48,7 +48,7 @@
     malicious scripts to attack bad behaving proxies.
     For more information about the importance of good masking,
     see \l {"Talking to Yourself for Fun and Profit" by Lin-Shung Huang et al}.
-    The default mask generator uses the reasonably secure QRandomGenerator::get32() function.
+    The default mask generator uses the reasonably secure QRandomGenerator::global()->generate() function.
     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
@@ -90,16 +90,16 @@ bool QDefaultMaskGenerator::seed() Q_DECL_NOEXCEPT
 }
 
 /*!
-    Generates a new random mask using the insecure QRandomGenerator::get32() method.
+    Generates a new random mask using the insecure QRandomGenerator::global()->generate() method.
 
     \internal
 */
 quint32 QDefaultMaskGenerator::nextMask() Q_DECL_NOEXCEPT
 {
-    quint32 value = QRandomGenerator::get32();
+    quint32 value = QRandomGenerator::global()->generate();
     while (Q_UNLIKELY(value == 0)) {
         // a mask of zero has a special meaning
-        value = QRandomGenerator::get32();
+        value = QRandomGenerator::global()->generate();
     }
     return value;
 }
diff --git a/src/websockets/qmaskgenerator.cpp b/src/websockets/qmaskgenerator.cpp
index 56d1223..40f8594 100644
--- a/src/websockets/qmaskgenerator.cpp
+++ b/src/websockets/qmaskgenerator.cpp
@@ -50,7 +50,7 @@
     malicious scripts from attacking badly behaving proxies.
     For more information about the importance of good masking,
     see \l {"Talking to Yourself for Fun and Profit" by Lin-Shung Huang et al}.
-    By default QWebSocket uses the reasonably secure QRandomGenerator::get32() function.
+    By default QWebSocket uses the reasonably secure QRandomGenerator::global()->generate() function.
     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
diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp
index 7a017b5..1b0fc35 100644
--- a/src/websockets/qwebsocket.cpp
+++ b/src/websockets/qwebsocket.cpp
@@ -64,7 +64,7 @@
     this problem is to use WebSocket over a secure connection.
 
     \warning To generate masks, this implementation of WebSockets uses the reasonably
-    secure QRandomGenerator::get32() function.
+    secure QRandomGenerator::global()->generate() function.
     For more information about the importance of good masking,
     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,
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 1a1bb1f..1cfa106 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -593,6 +593,9 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket)
                              &QWebSocket::preSharedKeyAuthenticationRequired);
             QObject::connect(sslSocket, &QSslSocket::encryptedBytesWritten, q,
                              &QWebSocket::bytesWritten);
+            QObjectPrivate::connect(sslSocket,
+                                    QOverload<const QList<QSslError>&>::of(&QSslSocket::sslErrors),
+                                    this, &QWebSocketPrivate::_q_updateSslConfiguration);
             QObject::connect(sslSocket,
                              QOverload<const QList<QSslError>&>::of(&QSslSocket::sslErrors),
                              q, &QWebSocket::sslErrors);
diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp
index 13f86de..59b50e7 100644
--- a/src/websockets/qwebsocketserver_p.cpp
+++ b/src/websockets/qwebsocketserver_p.cpp
@@ -490,6 +490,11 @@ void QWebSocketServerPrivate::handleConnection(QTcpSocket *pTcpSocket) const
         QObjectPrivate::connect(pTcpSocket, &QTcpSocket::readyRead,
                                 this, &QWebSocketServerPrivate::handshakeReceived,
                                 Qt::QueuedConnection);
+        if (pTcpSocket->canReadLine()) {
+            // We received some data! We must emit now to be sure that handshakeReceived is called
+            // since the data could have been received before the signal and slot was connected.
+            emit pTcpSocket->readyRead();
+        }
         QObjectPrivate::connect(pTcpSocket, &QTcpSocket::disconnected,
                                 this, &QWebSocketServerPrivate::onSocketDisconnected);
     }
diff --git a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
index 45394bc..8a3760d 100644
--- a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
+++ b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
@@ -31,9 +31,9 @@
 #include <QTcpServer>
 #ifndef QT_NO_OPENSSL
 #include <QtNetwork/qsslpresharedkeyauthenticator.h>
-#include <QtNetwork/qsslcipher.h>
 #endif
 #ifndef QT_NO_SSL
+#include <QtNetwork/qsslcipher.h>
 #include <QtNetwork/qsslkey.h>
 #endif
 #include <QtWebSockets/QWebSocketServer>
@@ -301,7 +301,7 @@ void tst_QWebSocketServer::tst_listening()
     QVERIFY(server.isListening());
     QCOMPARE(serverClosedSpy.count(), 0);
     server.close();
-    QVERIFY(serverClosedSpy.wait(1000));
+    QTRY_COMPARE(serverClosedSpy.count(), 1);
     QVERIFY(!server.isListening());
     QCOMPARE(serverErrorSpy.count(), 0);
 
@@ -347,8 +347,7 @@ void tst_QWebSocketServer::tst_connectivity()
 
     socket.open(server.serverUrl().toString());
 
-    if (socketConnectedSpy.count() == 0)
-        QVERIFY(socketConnectedSpy.wait());
+    QTRY_COMPARE(socketConnectedSpy.count(), 1);
     QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
     QCOMPARE(serverConnectionSpy.count(), 1);
     QCOMPARE(corsAuthenticationSpy.count(), 1);
@@ -357,8 +356,7 @@ void tst_QWebSocketServer::tst_connectivity()
 
     server.close();
 
-    QVERIFY(serverClosedSpy.wait());
-    QCOMPARE(serverClosedSpy.count(), 1);
+    QTRY_COMPARE(serverClosedSpy.count(), 1);
 #ifndef QT_NO_SSL
     QCOMPARE(peerVerifyErrorSpy.count(), 0);
     QCOMPARE(sslErrorsSpy.count(), 0);
@@ -429,8 +427,7 @@ void tst_QWebSocketServer::tst_preSharedKey()
 
     socket.open(server.serverUrl().toString());
 
-    if (socketConnectedSpy.count() == 0)
-        QVERIFY(socketConnectedSpy.wait());
+    QTRY_COMPARE(socketConnectedSpy.count(), 1);
     QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
     QCOMPARE(serverConnectionSpy.count(), 1);
     QCOMPARE(serverPskRequiredSpy.count(), 1);
@@ -440,8 +437,7 @@ void tst_QWebSocketServer::tst_preSharedKey()
 
     server.close();
 
-    QVERIFY(serverClosedSpy.wait());
-    QCOMPARE(serverClosedSpy.count(), 1);
+    QTRY_COMPARE(serverClosedSpy.count(), 1);
     QCOMPARE(sslErrorsSpy.count(), 0);
     QCOMPARE(serverErrorSpy.count(), 0);
 #endif
@@ -480,20 +476,18 @@ void tst_QWebSocketServer::tst_maxPendingConnections()
 
     socket1.open(server.serverUrl().toString());
 
-    if (socket1ConnectedSpy.count() == 0)
-        QVERIFY(socket1ConnectedSpy.wait());
+    QTRY_COMPARE(socket1ConnectedSpy.count(), 1);
     QCOMPARE(socket1.state(), QAbstractSocket::ConnectedState);
     QCOMPARE(serverConnectionSpy.count(), 1);
     QCOMPARE(corsAuthenticationSpy.count(), 1);
     socket2.open(server.serverUrl().toString());
-    if (socket2ConnectedSpy.count() == 0)
-        QVERIFY(socket2ConnectedSpy.wait());
+    QTRY_COMPARE(socket2ConnectedSpy.count(), 1);
     QCOMPARE(socket2.state(), QAbstractSocket::ConnectedState);
     QCOMPARE(serverConnectionSpy.count(), 2);
     QCOMPARE(corsAuthenticationSpy.count(), 2);
     socket3.open(server.serverUrl().toString());
-    if (socket3ConnectedSpy.count() == 0)
-        QVERIFY(!socket3ConnectedSpy.wait(250));
+    QVERIFY(!socket3ConnectedSpy.wait(250));
+    QCOMPARE(socket3ConnectedSpy.count(), 0);
     QCOMPARE(socket3.state(), QAbstractSocket::UnconnectedState);
     QCOMPARE(serverConnectionSpy.count(), 2);
     QCOMPARE(corsAuthenticationSpy.count(), 2);
@@ -519,8 +513,7 @@ void tst_QWebSocketServer::tst_maxPendingConnections()
 
     server.close();
 
-    QVERIFY(serverClosedSpy.wait());
-    QCOMPARE(serverClosedSpy.count(), 1);
+    QTRY_COMPARE(serverClosedSpy.count(), 1);
 #ifndef QT_NO_SSL
     QCOMPARE(peerVerifyErrorSpy.count(), 0);
     QCOMPARE(sslErrorsSpy.count(), 0);
@@ -550,8 +543,7 @@ void tst_QWebSocketServer::tst_serverDestroyedWhileSocketConnected()
 
     socket.open(server->serverUrl().toString());
 
-    if (socketConnectedSpy.count() == 0)
-        QVERIFY(socketConnectedSpy.wait());
+    QTRY_COMPARE(socketConnectedSpy.count(), 1);
     QCOMPARE(socket.state(), QAbstractSocket::ConnectedState);
     QCOMPARE(serverConnectionSpy.count(), 1);
     QCOMPARE(corsAuthenticationSpy.count(), 1);
@@ -560,9 +552,7 @@ void tst_QWebSocketServer::tst_serverDestroyedWhileSocketConnected()
 
     delete server;
 
-    if (socketDisconnectedSpy.count() == 0)
-        QVERIFY(socketDisconnectedSpy.wait());
-    QCOMPARE(socketDisconnectedSpy.count(), 1);
+    QTRY_COMPARE(socketDisconnectedSpy.count(), 1);
 }
 
 void tst_QWebSocketServer::tst_scheme()
@@ -578,8 +568,7 @@ void tst_QWebSocketServer::tst_scheme()
     QWebSocket plainSocket;
     plainSocket.open(plainServer.serverUrl().toString());
 
-    if (plainServerConnectionSpy.count() == 0)
-        QVERIFY(plainServerConnectionSpy.wait());
+    QTRY_COMPARE(plainServerConnectionSpy.count(), 1);
     QScopedPointer<QWebSocket> plainServerSocket(plainServer.nextPendingConnection());
     QVERIFY(!plainServerSocket.isNull());
     QCOMPARE(plainServerSocket->requestUrl().scheme(), QStringLiteral("ws"));
@@ -605,17 +594,21 @@ void tst_QWebSocketServer::tst_scheme()
 
     QVERIFY(secureServer.listen());
 
+    QSslCipher sessionCipher;
     QWebSocket secureSocket;
     connect(&secureSocket, &QWebSocket::sslErrors,
-            &secureSocket, QOverload<>::of(&QWebSocket::ignoreSslErrors));
+            &secureSocket, [&] {
+                secureSocket.ignoreSslErrors();
+                sessionCipher = secureSocket.sslConfiguration().sessionCipher();
+            });
     secureSocket.open(secureServer.serverUrl().toString());
 
-    if (secureServerConnectionSpy.count() == 0)
-        QVERIFY(secureServerConnectionSpy.wait());
+    QTRY_COMPARE(secureServerConnectionSpy.count(), 1);
     QScopedPointer<QWebSocket> secureServerSocket(secureServer.nextPendingConnection());
     QVERIFY(!secureServerSocket.isNull());
     QCOMPARE(secureServerSocket->requestUrl().scheme(), QStringLiteral("wss"));
     secureServer.close();
+    QVERIFY(!sessionCipher.isNull());
 #endif
 }
 
@@ -634,19 +627,17 @@ void tst_QWebSocketServer::tst_handleConnection()
     QWebSocket webSocket;
     QSignalSpy wsConnectedSpy(&webSocket, &QWebSocket::connected);
     webSocket.open(QStringLiteral("ws://localhost:%1").arg(tcpServer.serverPort()));
-    QVERIFY(wsConnectedSpy.wait());
+    QTRY_COMPARE(wsConnectedSpy.count(), 1);
 
-    if (wsServerConnectionSpy.isEmpty())
-        QVERIFY(wsServerConnectionSpy.wait());
+    QTRY_COMPARE(wsServerConnectionSpy.count(), 1);
 
     QScopedPointer<QWebSocket> webServerSocket(wsServer.nextPendingConnection());
     QVERIFY(!webServerSocket.isNull());
 
     QSignalSpy wsMessageReceivedSpy(webServerSocket.data(), &QWebSocket::textMessageReceived);
     webSocket.sendTextMessage("dummy");
-    wsMessageReceivedSpy.wait();
 
-    QCOMPARE(wsMessageReceivedSpy.count(), 1);
+    QTRY_COMPARE(wsMessageReceivedSpy.count(), 1);
     QList<QVariant> arguments = wsMessageReceivedSpy.takeFirst();
     QCOMPARE(arguments.first().toString(), QString("dummy"));
 }