diff options
| author | Benjamin C Meyer <ben@meyerhome.net> | 2009-09-01 07:51:56 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-01 08:32:11 (GMT) |
| commit | 925912ebf552417306a5bd20fd986afda6a582be (patch) | |
| tree | d459905a04f1540fef8569d03417647c95a98ef4 /src/network/access/qnetworkaccessmanager.cpp | |
| parent | 63e2f5d2c95ece21fd32d0690022b89c38fee865 (diff) | |
| download | Qt-925912ebf552417306a5bd20fd986afda6a582be.zip Qt-925912ebf552417306a5bd20fd986afda6a582be.tar.gz Qt-925912ebf552417306a5bd20fd986afda6a582be.tar.bz2 | |
QNetworkAccessManager can delete the QAbstractNetworkCache pointer at
any point. Rather then keep a separate pointer to the cache in the
reply use the pointer kept by the manager so the reply never tries
to access a cache pointer that has already been deleted.
Autotest: included
Merge-request: 1124
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/network/access/qnetworkaccessmanager.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index aafe44b..5a8756b 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -692,9 +692,6 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera // third step: setup the reply priv->setup(op, request, outgoingData); - if (request.attribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork).toInt() != - QNetworkRequest::AlwaysNetwork) - priv->setNetworkCache(d->networkCache); #ifndef QT_NO_NETWORKPROXY QList<QNetworkProxy> proxyList = d->queryProxy(QNetworkProxyQuery(request.url())); priv->proxyList = proxyList; |