summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAleksey Lysenko <lysenkoalexmail@gmail.com>2016-12-16 15:57:26 +0200
committerAleksey Lysenko <lysenkoalexmail@gmail.com>2016-12-16 19:41:20 +0000
commit503a1353dcf23f8a5fcb8a2c79d55f707e75cf33 (patch)
treef91f24456a29b3b6e845933eae07733c18586a84 /src
parenta5c85e3250a10a8e23ce15f9a6811136f6bb23fd (diff)
downloadqtwebsockets-503a1353dcf23f8a5fcb8a2c79d55f707e75cf33.tar.gz
Fixed wrong scheme for secure websocket
Websocket server always constructed QWebSocketHandshakeRequest like for non-secure socket without checking SecureMode. This led to the fact that secure socket had "ws" scheme. Task-number: QTBUG-55927 Change-Id: I881766f55182136072fd23f3fefe93ea60f3d27d Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/websockets/qwebsocketserver_p.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/qwebsocketserver_p.cpp b/src/websockets/qwebsocketserver_p.cpp
index 3bf6d68..d675056 100644
--- a/src/websockets/qwebsocketserver_p.cpp
+++ b/src/websockets/qwebsocketserver_p.cpp
@@ -435,7 +435,7 @@ void QWebSocketServerPrivate::handshakeReceived()
this, &QWebSocketServerPrivate::handshakeReceived);
Q_Q(QWebSocketServer);
bool success = false;
- bool isSecure = false;
+ bool isSecure = (m_secureMode == SecureMode);
if (m_pendingConnections.length() >= maxPendingConnections()) {
pTcpSocket->close();