diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-11 15:42:27 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-11 15:42:27 +0200 |
commit | cd26439ac7ca1a444e9b5534a504afb0bb411890 (patch) | |
tree | e6901020de599f4764e3120bb7172ba528f1d0a8 /src/websockets/qwebsockethandshakerequest.cpp | |
parent | 5775c5e344e94f47af73d0d72a631375fb10d3d5 (diff) | |
parent | b05ec56db6f17f04387af72b8e1b9a64b1092daa (diff) | |
download | qtwebsockets-cd26439ac7ca1a444e9b5534a504afb0bb411890.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2
Conflicts:
.qmake.conf
Change-Id: I4af142703e469b56236b73335a93f6960534c0f1
Diffstat (limited to 'src/websockets/qwebsockethandshakerequest.cpp')
-rw-r--r-- | src/websockets/qwebsockethandshakerequest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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 |