summaryrefslogtreecommitdiff
path: root/src/websockets/qwebsocketserver_p.h
diff options
context:
space:
mode:
authorMÃ¥rten Nordheim <marten.nordheim@qt.io>2022-08-19 14:37:27 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-31 13:54:49 +0000
commit5e949114ae38123757d17de7559287dde23cf141 (patch)
tree93b7b9d93f3f9e7eb5ba2cbac78dbff42595919f /src/websockets/qwebsocketserver_p.h
parent1b3696be9d57ebe164a0cb07aaee80a36af9baa5 (diff)
downloadqtwebsockets-5e949114ae38123757d17de7559287dde23cf141.tar.gz
QWebSocketServer: update handshake timeout to keep up with QSslServer
A side-effect of this is that the timeout is now duplicated. The TLS handshake first has the 'msec' timeout, and then the websocket handshake has the same 'msec' timeout. [ChangeLog][QWebSocketServer] Due to the introduction of a standalone QSslServer, with its own timeout handling, the setHandshakeTimeout() function now applies the same timeout to both the TLS and WebSocket handshakes separately. Fixes: QTBUG-105851 Change-Id: I6c515e0dcdf83fa452979b06ab5f890c8b14b184 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> (cherry picked from commit d885e441310c1f69b306a0eadbafde1058aa389a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/websockets/qwebsocketserver_p.h')
-rw-r--r--src/websockets/qwebsocketserver_p.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/websockets/qwebsocketserver_p.h b/src/websockets/qwebsocketserver_p.h
index 6d7ffcd..9941341 100644
--- a/src/websockets/qwebsocketserver_p.h
+++ b/src/websockets/qwebsocketserver_p.h
@@ -68,9 +68,7 @@ public:
QWebSocketProtocol::CloseCode serverError() const;
quint16 serverPort() const;
void setMaxPendingConnections(int numConnections);
- void setHandshakeTimeout(int msec) {
- m_handshakeTimeout = msec;
- }
+ void setHandshakeTimeout(int msec);
bool setSocketDescriptor(qintptr socketDescriptor);
qintptr socketDescriptor() const;