diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2010-09-28 12:56:54 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2010-09-28 14:32:23 (GMT) |
| commit | 4f1235af805d6ec947730e33d270c30d298e51dc (patch) | |
| tree | d7bf126b3377378372b46b68c6ad8d9a3e9f2b25 /src/network/ssl/qsslsocket.cpp | |
| parent | 02de74f0b2d443e410154e96321357cfe2ef9aad (diff) | |
| download | Qt-4f1235af805d6ec947730e33d270c30d298e51dc.zip Qt-4f1235af805d6ec947730e33d270c30d298e51dc.tar.gz Qt-4f1235af805d6ec947730e33d270c30d298e51dc.tar.bz2 | |
QSslSocket speed up loading of system certificates on Unix (not Mac)
... by only reading in a certificate once. Before, we were adding all
files from all directories; since they often contained symlinks, the
same certificate was added several times.
Reviewed-by: Markus Goetz
Reviewed-by: Thiago Macieira
Task-number: QTBUG-14013
Diffstat (limited to 'src/network/ssl/qsslsocket.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index f18c629..c9f421f 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1354,7 +1354,7 @@ QList<QSslCertificate> QSslSocket::defaultCaCertificates() */ QList<QSslCertificate> QSslSocket::systemCaCertificates() { - QSslSocketPrivate::ensureInitialized(); + // we are calling ensureInitialized() in the method below return QSslSocketPrivate::systemCaCertificates(); } |