diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:52:41 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:52:41 +0100 |
| commit | 68d2ada4b03fbdbe9ab98c2ea7097f0a058e10b4 (patch) | |
| tree | 48fee0e5cef48a442f816328abe6bac28160df1e /src/websockets/qwebsocket_p.cpp | |
| parent | 5b34b19b0a37624a3f5846a949112929ef5feeeb (diff) | |
| parent | 9ef6658541c2e816b8119df98c1b66add5b7bcdd (diff) | |
| download | qtwebsockets-68d2ada4b03fbdbe9ab98c2ea7097f0a058e10b4.tar.gz | |
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: I3445dc11f83f37a784867762691b372df47ff938
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 36aefd9..bca4ccd 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -1099,9 +1099,6 @@ void QWebSocketPrivate::processStateChanged(QAbstractSocket::SocketState socketS Q_ASSERT(m_pSocket); Q_Q(QWebSocket); QAbstractSocket::SocketState webSocketState = this->state(); - int port = 80; - if (m_request.url().scheme() == QStringLiteral("wss")) - port = 443; switch (socketState) { case QAbstractSocket::ConnectedState: @@ -1120,11 +1117,10 @@ void QWebSocketPrivate::processStateChanged(QAbstractSocket::SocketState socketS const auto format = QUrl::RemoveScheme | QUrl::RemoveUserInfo | QUrl::RemovePath | QUrl::RemoveQuery - | QUrl::RemoveFragment | QUrl::RemovePort; + | QUrl::RemoveFragment; const QString host = m_request.url().toString(format).mid(2); const QString handshake = createHandShakeRequest(m_resourceName, - host % QStringLiteral(":") - % QString::number(m_request.url().port(port)), + host, origin(), QString(), QString(), |