blob: 10c952151d545cc7ee2bcd51b2cfa1d7dd80d9ea (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From c91acbedf93a3526e8c58197b1ae8d6676a54078 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 25 Jan 2021 15:34:22 +0100
Subject: [PATCH 1/2] Clear frame on reconnect
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Otherwise partial data could leak through to next connection and cause
odd behavior
* asturmlechner 2021-12-22: Fix conflict with dev branch aeeaa00f
Pick-to: 5.15
Fixes: QTBUG-88923
Change-Id: I6c75e6325527379bcdca0b9819a89437d0658893
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 9f6449ef1b6d1e7651f181585f1c35d6722bb87a)
---
src/websockets/qwebsocketdataprocessor.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/websockets/qwebsocketdataprocessor.cpp b/src/websockets/qwebsocketdataprocessor.cpp
index 2affdd5..95f1194 100644
--- a/src/websockets/qwebsocketdataprocessor.cpp
+++ b/src/websockets/qwebsocketdataprocessor.cpp
@@ -273,6 +273,7 @@ void QWebSocketDataProcessor::clear()
if (!m_pConverterState)
m_pConverterState = new QTextCodec::ConverterState(QTextCodec::ConvertInvalidToNull |
QTextCodec::IgnoreHeader);
+ frame.clear();
}
/*!
--
2.49.0
From db9cb84499229143506a9692fc65d3cb223b3978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Tue, 13 Dec 2022 17:07:48 +0100
Subject: [PATCH 2/2] Disconnect when handshake fails
It is unexpected that websocket does not disconnect once
it knows the handshake has failed.
Pick-to: 6.5 6.4 6.2 5.15
Change-Id: I11e64745ffdb01c11ac79739cf7f384ad6cc4590
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 7efdec16d9f6116fc6c13bc3ae7c9b9e229e5a49)
* asturmlechner 2023-01-06: Resolve conflict with dev branch commit
55cef3a13c8377c55b2fe050751c8a05eb7f9fce
---
src/websockets/qwebsocket_p.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index cf3087f..0dd0fa6 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1100,6 +1100,8 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
m_handshakeState = AllDoneState;
setErrorString(errorDescription);
Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError);
+ if (m_pSocket->state() != QAbstractSocket::UnconnectedState)
+ m_pSocket->disconnectFromHost();
}
}
--
2.49.0
|
