25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
|
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
|
||
|
|
index 4273904c..8d064ba0 100644
|
||
|
|
--- a/src/network/ssl/qsslsocket.cpp
|
||
|
|
+++ b/src/network/ssl/qsslsocket.cpp
|
||
|
|
@@ -2053,6 +2053,10 @@ QSslSocketPrivate::QSslSocketPrivate()
|
||
|
|
, flushTriggered(false)
|
||
|
|
{
|
||
|
|
QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration);
|
||
|
|
+ // If the global configuration doesn't allow root certificates to be loaded
|
||
|
|
+ // on demand then we have to disable it for this socket as well.
|
||
|
|
+ if (!configuration.allowRootCertOnDemandLoading)
|
||
|
|
+ allowRootCertOnDemandLoading = false;
|
||
|
|
}
|
||
|
|
|
||
|
|
/*!
|
||
|
|
@@ -2252,6 +2256,7 @@ void QSslConfigurationPrivate::deepCopyDefaultConfiguration(QSslConfigurationPri
|
||
|
|
ptr->sessionProtocol = global->sessionProtocol;
|
||
|
|
ptr->ciphers = global->ciphers;
|
||
|
|
ptr->caCertificates = global->caCertificates;
|
||
|
|
+ ptr->allowRootCertOnDemandLoading = global->allowRootCertOnDemandLoading;
|
||
|
|
ptr->protocol = global->protocol;
|
||
|
|
ptr->peerVerifyMode = global->peerVerifyMode;
|
||
|
|
ptr->peerVerifyDepth = global->peerVerifyDepth;
|
||
|
|
|