diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:02:17 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:02:17 +0100 |
| commit | b28c271f549208f0b41bed4752b53e5750711a35 (patch) | |
| tree | 4025de531f2365660cdf46ccb3b9b3c2ed12a1bc | |
| parent | 370a7c165bf3bb46195b7077c5a88bd97bb67d17 (diff) | |
| parent | e3d919e215d987ec8f912c7cec05ba502d4c3f0b (diff) | |
| download | qtwebsockets-b28c271f549208f0b41bed4752b53e5750711a35.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I5e23a3547605ef561af0f749e49cc99fffe7437f
| -rw-r--r-- | examples/websockets/sslechoserver/sslechoserver.cpp | 1 | ||||
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/examples/websockets/sslechoserver/sslechoserver.cpp b/examples/websockets/sslechoserver/sslechoserver.cpp index 00bc6c1..5dc41e0 100644 --- a/examples/websockets/sslechoserver/sslechoserver.cpp +++ b/examples/websockets/sslechoserver/sslechoserver.cpp @@ -77,7 +77,6 @@ SslEchoServer::SslEchoServer(quint16 port, QObject *parent) : sslConfiguration.setPeerVerifyMode(QSslSocket::VerifyNone); sslConfiguration.setLocalCertificate(certificate); sslConfiguration.setPrivateKey(sslKey); - sslConfiguration.setProtocol(QSsl::TlsV1SslV3); m_pWebSocketServer->setSslConfiguration(sslConfiguration); if (m_pWebSocketServer->listen(QHostAddress::Any, port)) diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 17f0224..434dca4 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -198,7 +198,7 @@ QAbstractSocket::SocketError QWebSocketPrivate::error() const { QAbstractSocket::SocketError err = QAbstractSocket::UnknownSocketError; if (Q_LIKELY(m_pSocket)) - err = m_pSocket->error(); + err = m_pSocket->socketError(); return err; } diff --git a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp index c40bb01..a56594c 100644 --- a/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp +++ b/tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp @@ -604,7 +604,6 @@ static void setupSecureServer(QWebSocketServer *secureServer) sslConfiguration.setPeerVerifyMode(QSslSocket::VerifyNone); sslConfiguration.setLocalCertificate(certificate); sslConfiguration.setPrivateKey(sslKey); - sslConfiguration.setProtocol(QSsl::TlsV1SslV3); secureServer->setSslConfiguration(sslConfiguration); } #endif |