diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-18 16:05:13 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-18 16:05:13 (GMT) |
commit | f9815142befe5fb312a6fea1dac43c33a3189145 (patch) | |
tree | 54f3229cb2c7c6694d558d68c2d53c40211f1126 /src/network/access/qnetworkreplyimpl.cpp | |
parent | 9d63852e31674eb5de2da5cb57a09aff31aabb31 (diff) | |
parent | 1811da78fc63371e2639a230e0aa81ed7f47695a (diff) | |
download | Qt-f9815142befe5fb312a6fea1dac43c33a3189145.zip Qt-f9815142befe5fb312a6fea1dac43c33a3189145.tar.gz Qt-f9815142befe5fb312a6fea1dac43c33a3189145.tar.bz2 |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/network/access/qnetworkreplyimpl.cpp')
-rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 485f449..1c9fa3e 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -514,6 +514,13 @@ void QNetworkReplyImplPrivate::initCacheSaveDevice() { Q_Q(QNetworkReplyImpl); + // The disk cache does not support partial content, so don't even try to + // save any such content into the cache. + if (q->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 206) { + cacheEnabled = false; + return; + } + // save the meta data QNetworkCacheMetaData metaData; metaData.setUrl(url); |