diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-10-19 16:05:17 +0200 |
|---|---|---|
| committer | André Klitzing <aklitzing@gmail.com> | 2017-10-27 14:58:36 +0000 |
| commit | 203da360c4bcd64bdd17639d495f1857b622e92d (patch) | |
| tree | 5f471ced4bdd07dddab93fdf00f3139c01fe79b5 /src | |
| parent | 905a6cea6c205015445bcd11c8f2616576a092c5 (diff) | |
| download | qtwebsockets-203da360c4bcd64bdd17639d495f1857b622e92d.tar.gz | |
Fix empty sslConfiguration in sslErrors slot
If QWebSocket fires signal sslErrors the
QSslConfiguration of QWebSocket is not updated.
So client application cannot check it in
implemented slot.
Fix this by calling the update method like
for encrypted signal.
Sibling of QTBUG-40401.
Change-Id: I18b39f6b6a0791ae67fc2bff5cf2c04a22b0ab85
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 7863567..bee2afa 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -596,6 +596,9 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket) QObject::connect(sslSocket, &QSslSocket::encryptedBytesWritten, q, &QWebSocket::bytesWritten); typedef void (QSslSocket:: *sslErrorSignalType)(const QList<QSslError> &); + QObjectPrivate::connect(sslSocket, + static_cast<sslErrorSignalType>(&QSslSocket::sslErrors), + this, &QWebSocketPrivate::_q_updateSslConfiguration); QObject::connect(sslSocket, static_cast<sslErrorSignalType>(&QSslSocket::sslErrors), q, &QWebSocket::sslErrors); |