summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-04-27 18:31:37 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-05-08 23:13:55 (GMT)
commitaef97ec5e684f75e4f4e36da1ac321270a1ae2f3 (patch)
tree670a2862bf5968a7e8d88092fe52f4be0bcca009 /src
parent3739b68406b8ada6993a8c00d0b06bc9e5b719e5 (diff)
downloadQt-aef97ec5e684f75e4f4e36da1ac321270a1ae2f3.zip
Qt-aef97ec5e684f75e4f4e36da1ac321270a1ae2f3.tar.gz
Qt-aef97ec5e684f75e4f4e36da1ac321270a1ae2f3.tar.bz2
Use reference count to close down idle network session
QNetworkAccessManager was using the AutoCloseConnection property of QNetworkSession to close it when idle. However this property is only implemented for polling engines and not event driven engines. Instead, release the network session reference. If another request comes in, it will be resurrected from the shared session weak reference. If not, then after 2 minutes when the connection caches are flushed the ref count will reach zero and cause the QNetworkSession to be destroyed (which closes it) Task-number: QTBUG-15812 Change-Id: I2963bdf13fb02e3ac269489ea463669142f3c5f3 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 1aeaf0e7089c893a927a5ab311a6176aad5874a7)
Diffstat (limited to 'src')
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 6e49c11..9204a89 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -948,9 +948,6 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
d->initializeSession = false;
}
}
-
- if (d->networkSession)
- d->networkSession->setSessionProperty(QLatin1String("AutoCloseSessionTimeout"), -1);
#endif
QNetworkRequest request = req;
@@ -1014,8 +1011,11 @@ void QNetworkAccessManagerPrivate::_q_replyFinished()
emit q->finished(reply);
#ifndef QT_NO_BEARERMANAGEMENT
+ // If there are no active requests, release our reference to the network session.
+ // It will not be destroyed immediately, but rather when the connection cache is flushed
+ // after 2 minutes.
if (networkSession && q->findChildren<QNetworkReply *>().count() == 1)
- networkSession->setSessionProperty(QLatin1String("AutoCloseSessionTimeout"), 120000);
+ networkSession.clear();
#endif
}