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 13:59:09 +0100 |
| commit | 6498859f9cebbc2299e679fb93d5aacdc699fb5c (patch) | |
| tree | 6363f476eb3fab5f2fd95aff70028952ce79b4c8 | |
| parent | 9f1bfd08c47de2a1f59b406ae57e5a90d2670ea6 (diff) | |
| parent | b28c271f549208f0b41bed4752b53e5750711a35 (diff) | |
| download | qtwebsockets-6498859f9cebbc2299e679fb93d5aacdc699fb5c.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
| -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 01b58b5..51738ed 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 |