diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-07-23 22:54:54 (GMT) |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-07-23 22:54:54 (GMT) |
commit | 2d868c78f3da4757188cf014b2dac9d8a75f9991 (patch) | |
tree | 04894580c93cb1885105d6a59697f3f45ddb7531 /src/network/access/qnetworkreplyimpl.cpp | |
parent | 787f2252077434581101df64d0f0d576c26b7ce8 (diff) | |
parent | b31186b720d239daad69c49d8a862dce4e301d5d (diff) | |
download | Qt-2d868c78f3da4757188cf014b2dac9d8a75f9991.zip Qt-2d868c78f3da4757188cf014b2dac9d8a75f9991.tar.gz Qt-2d868c78f3da4757188cf014b2dac9d8a75f9991.tar.bz2 |
Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shaders
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'src/network/access/qnetworkreplyimpl.cpp')
-rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 44ae328..de7f8b4 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -401,7 +401,17 @@ void QNetworkReplyImplPrivate::appendDownstreamData(QByteDataBuffer &data) QNetworkCacheMetaData metaData; metaData.setUrl(url); metaData = backend->fetchCacheMetaData(metaData); + + // save the redirect request also in the cache + QVariant redirectionTarget = q->attribute(QNetworkRequest::RedirectionTargetAttribute); + if (redirectionTarget.isValid()) { + QNetworkCacheMetaData::AttributesMap attributes = metaData.attributes(); + attributes.insert(QNetworkRequest::RedirectionTargetAttribute, redirectionTarget); + metaData.setAttributes(attributes); + } + cacheSaveDevice = networkCache->prepare(metaData); + if (!cacheSaveDevice || (cacheSaveDevice && !cacheSaveDevice->isOpen())) { if (cacheSaveDevice && !cacheSaveDevice->isOpen()) qCritical("QNetworkReplyImpl: network cache returned a device that is not open -- " @@ -649,6 +659,12 @@ void QNetworkReplyImpl::ignoreSslErrors() d->backend->ignoreSslErrors(); } +void QNetworkReplyImpl::ignoreSslErrorsImplementation(const QList<QSslError> &errors) +{ + Q_D(QNetworkReplyImpl); + if (d->backend) + d->backend->ignoreSslErrors(errors); +} #endif // QT_NO_OPENSSL /*! |