diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-04 10:41:56 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-10-17 12:02:49 +0200 |
| commit | 77d812683f0ad595606f9833613dd49bb2fda26d (patch) | |
| tree | c1fb2f4a3e680db9c5597574fe8684571da0e0f5 /src/network/ssl | |
| parent | f76530a6171ca417865863b66e3ea439c27d057e (diff) | |
Refactor QMutexLocker to be able to handle recursive mutexes
Since we're going to split QMutex and QRecursiveMutex into
separate classes, make sure QMutexLocker is prepared for that.
Change-Id: Id5e9a955d1db7c8ee663dd3811ad6448dad0aeae
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslsocket_mac.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp index 4096fb68c6..9eb9609315 100644 --- a/src/network/ssl/qsslsocket_mac.cpp +++ b/src/network/ssl/qsslsocket_mac.cpp @@ -314,7 +314,7 @@ OSStatus QSslSocketBackendPrivate::WriteCallback(QSslSocketBackendPrivate *socke void QSslSocketPrivate::ensureInitialized() { - const QMutexLocker locker(qt_securetransport_mutex); + const QMutexLocker locker(qt_securetransport_mutex()); if (s_loadedCiphersAndCerts) return; diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index c5f82502fc..39d011d684 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -2233,7 +2233,7 @@ bool QSslSocketPrivate::ensureLibraryLoaded() if (!q_resolveOpenSslSymbols()) return false; - const QMutexLocker locker(qt_opensslInitMutex); + const QMutexLocker locker(qt_opensslInitMutex()); if (!s_libraryLoaded) { // Initialize OpenSSL. @@ -2265,7 +2265,7 @@ bool QSslSocketPrivate::ensureLibraryLoaded() void QSslSocketPrivate::ensureCiphersAndCertsLoaded() { - const QMutexLocker locker(qt_opensslInitMutex); + const QMutexLocker locker(qt_opensslInitMutex()); if (s_loadedCiphersAndCerts) return; |