From 128cab4635c3ea42af5d3b9952f7b7e1d89284e7 Mon Sep 17 00:00:00 2001 From: Michael Marley Date: Mon, 12 Jan 2015 21:59:43 -0500 Subject: Set pendingClose to false on init in QSslSocket Fixes an issue where under certain circumstances, QSslSocket could get stuck in a state where it would disconnect immediately after starting encryption. Since it doesn't make any sense for the socket to be initialized to a state where any connection attempt will fail, the pendingClose value should be set to false. Thanks to Martin Sandsmark for his help debugging this issue. Task-number: QTBUG-43793 Change-Id: I7deebacbac588c21439a8e594db4222095cf3f22 Reviewed-by: Richard J. Moore --- src/network/ssl/qsslsocket.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/network/ssl/qsslsocket.cpp') diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 31c7b3087e..0f7c376e04 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1982,6 +1982,7 @@ void QSslSocketPrivate::init() connectionEncrypted = false; ignoreAllSslErrors = false; shutdown = false; + pendingClose = false; // we don't want to clear the ignoreErrorsList, so // that it is possible setting it before connecting -- cgit v1.2.3 From 027d2fc84663b969bf8b166898bd5efec8fcf465 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 18 Jan 2015 11:25:09 +0100 Subject: Doc: add missing since 5.4 for new sessionProtocol() methods. They were added in 233a2f37bfa6c896612cbf9a7db42e8e0da788f5, which is in 5.4, but the \since information was missing. Change-Id: I346a049cad75647fdcd7b64df80dc169bb4ec70a Reviewed-by: Richard J. Moore --- src/network/ssl/qsslsocket.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/network/ssl/qsslsocket.cpp') diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 31c7b3087e..f735b6bd4f 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1081,6 +1081,7 @@ QSslCipher QSslSocket::sessionCipher() const is set during the handshake phase. \sa protocol(), setProtocol() + \since 5.4 */ QSsl::SslProtocol QSslSocket::sessionProtocol() const { -- cgit v1.2.3