diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-03-29 10:58:32 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-03-31 14:42:52 (GMT) |
| commit | f7a6e37cab7a68451b176d22acf34ed41d4f1d79 (patch) | |
| tree | 1576b6e10004c9b41e9943655085f78d92667959 /src | |
| parent | 00121f3184ade624ca9cbb2524222dcab9f67342 (diff) | |
| download | Qt-f7a6e37cab7a68451b176d22acf34ed41d4f1d79.zip Qt-f7a6e37cab7a68451b176d22acf34ed41d4f1d79.tar.gz Qt-f7a6e37cab7a68451b176d22acf34ed41d4f1d79.tar.bz2 | |
Fix deadlock in QNetworkSession::stop
The mutex added needs to be recursive, as stop calls close internally,
which also needs to lock the mutex.
Reviewed-by: Markus Goetz
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/bearer/qnetworksession_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h index b359f80..a92b7ce 100644 --- a/src/network/bearer/qnetworksession_p.h +++ b/src/network/bearer/qnetworksession_p.h @@ -75,7 +75,7 @@ class Q_NETWORK_EXPORT QNetworkSessionPrivate : public QObject public: QNetworkSessionPrivate() : QObject(), - state(QNetworkSession::Invalid), isOpen(false) + state(QNetworkSession::Invalid), isOpen(false), mutex(QMutex::Recursive) {} virtual ~QNetworkSessionPrivate() {} |