Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2

 Conflicts:
	.qmake.conf

Change-Id: I4af142703e469b56236b73335a93f6960534c0f1

2 files changed, 12 insertions, 11 deletions

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 2e19d3d..6abffdc 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -633,7 +633,7 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket)
 void QWebSocketPrivate::releaseConnections(const QTcpSocket *pTcpSocket)
 {
     if (Q_LIKELY(pTcpSocket))
-        pTcpSocket->disconnect(pTcpSocket);
+        pTcpSocket->disconnect();
     m_dataProcessor.disconnect();
 }
 
@@ -1145,7 +1145,8 @@ void QWebSocketPrivate::socketDestroyed(QObject *socket)
  */
 void QWebSocketPrivate::processData()
 {
-    Q_ASSERT(m_pSocket);
+    if (!m_pSocket) // disconnected with data still in-bound
+        return;
     while (m_pSocket->bytesAvailable()) {
         if (state() == QAbstractSocket::ConnectingState) {
             if (!m_pSocket->canReadLine())
diff --git a/src/websockets/qwebsockethandshakerequest.cpp b/src/websockets/qwebsockethandshakerequest.cpp
index ddeee2d..e6a626c 100644
--- a/src/websockets/qwebsockethandshakerequest.cpp
+++ b/src/websockets/qwebsockethandshakerequest.cpp
@@ -318,17 +318,17 @@ void QWebSocketHandshakeRequest::readHandshake(QTextStream &textStream, int maxH
     //optional headers
     m_origin = m_headers.value(QStringLiteral("origin"), QString());
     const QStringList protocolLines = m_headers.values(QStringLiteral("sec-websocket-protocol"));
-    for (QStringList::const_iterator pl = protocolLines.begin(); pl != protocolLines.end(); ++pl) {
-        QStringList protocols = (*pl).split(QStringLiteral(","), QString::SkipEmptyParts);
-        for (QStringList::const_iterator p = protocols.begin(); p != protocols.end(); ++p)
-            m_protocols << (*p).trimmed();
+    for (const QString& pl : protocolLines) {
+        const QStringList protocols = pl.split(QStringLiteral(","), QString::SkipEmptyParts);
+        for (const QString& p : protocols)
+            m_protocols << p.trimmed();
     }
+
     const QStringList extensionLines = m_headers.values(QStringLiteral("sec-websocket-extensions"));
-    for (QStringList::const_iterator el = extensionLines.begin();
-         el != extensionLines.end(); ++el) {
-        QStringList extensions = (*el).split(QStringLiteral(","), QString::SkipEmptyParts);
-        for (QStringList::const_iterator e = extensions.begin(); e != extensions.end(); ++e)
-            m_extensions << (*e).trimmed();
+    for (const QString& el : extensionLines) {
+        const QStringList extensions = el.split(QStringLiteral(","), QString::SkipEmptyParts);
+        for (const QString& e : extensions)
+            m_extensions << e.trimmed();
     }
 
     //TODO: authentication field