Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I059725e3b7d7ffd5a16a0931e6c17200917172b5

1 files changed, 6 insertions, 2 deletions

diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 590b3dfc67..0ce5c8915d 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -325,9 +325,13 @@ bool QSslSocketBackendPrivate::initSslContext()
     Q_Q(QSslSocket);
 
     // If no external context was set (e.g. bei QHttpNetworkConnection) we will create a default context
-    if (!sslContextPointer)
+    if (!sslContextPointer) {
+        // create a deep copy of our configuration
+        QSslConfigurationPrivate *configurationCopy = new QSslConfigurationPrivate(configuration);
+        configurationCopy->ref.store(0);              // the QSslConfiguration constructor refs up
         sslContextPointer = QSharedPointer<QSslContext>(
-                    QSslContext::fromConfiguration(mode, QSslConfiguration(&configuration), allowRootCertOnDemandLoading));
+                    QSslContext::fromConfiguration(mode, configurationCopy, allowRootCertOnDemandLoading));
+    }
 
     if (sslContextPointer->error() != QSslError::NoError) {
         q->setErrorString(sslContextPointer->errorString());