From 311f231f8b308b10e1b355ae366505c8ffadf86f Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@theqtcompany.com>
Date: Fri, 22 May 2015 08:22:35 +0200
Subject: Correct the default port of secure hand shake request

Task-number: QTBUG-46055
Change-Id: Iefdec32f778d39520802eabb25f4db37f80fdf76
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Luca Niccoli <lultimouomo@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
---
 src/websockets/qwebsocket_p.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index c7a2d00..174214c 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1038,6 +1038,10 @@ void QWebSocketPrivate::processStateChanged(QAbstractSocket::SocketState socketS
     Q_ASSERT(m_pSocket);
     Q_Q(QWebSocket);
     QAbstractSocket::SocketState webSocketState = this->state();
+    int port = 80;
+    if (m_requestUrl.scheme() == QStringLiteral("wss"))
+        port = 443;
+
     switch (socketState) {
     case QAbstractSocket::ConnectedState:
         if (webSocketState == QAbstractSocket::ConnectingState) {
@@ -1046,7 +1050,7 @@ void QWebSocketPrivate::processStateChanged(QAbstractSocket::SocketState socketS
                     createHandShakeRequest(m_resourceName,
                                            m_requestUrl.host()
                                                 % QStringLiteral(":")
-                                                % QString::number(m_requestUrl.port(80)),
+                                                % QString::number(m_requestUrl.port(port)),
                                            origin(),
                                            QString(),
                                            QString(),
-- 
cgit v1.2.1