diff options
| author | Markus Goetz <Markus.Goetz@nokia.com> | 2011-07-12 12:45:02 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-12 13:57:14 +0200 |
| commit | 37be55a86f78da6d177e387b79cbc5d2aacef773 (patch) | |
| tree | e9afbd285268e09aee3898326176a6c534c24acd /src/network/access/qhttpnetworkreply.cpp | |
| parent | e11fac22c41f5f796bbfabc5088ff8a1cee3cd3b (diff) | |
QNAM HTTP: Do zero-copy for small HTTP replies by default
Task-Number: QTBUG-19046
Change-Id: I34bf432c81d94787524124b7d110a00305a660c1
Reviewed-on: http://codereview.qt.nokia.com/1516
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'src/network/access/qhttpnetworkreply.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkreply.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp index 00653b62e8..04bcd06908 100644 --- a/src/network/access/qhttpnetworkreply.cpp +++ b/src/network/access/qhttpnetworkreply.cpp @@ -211,7 +211,7 @@ void QHttpNetworkReply::setDownstreamLimited(bool dsl) bool QHttpNetworkReply::supportsUserProvidedDownloadBuffer() { Q_D(QHttpNetworkReply); - return (!d->isChunked() && !d->autoDecompress && d->bodyLength > 0); + return (!d->isChunked() && !d->autoDecompress && d->bodyLength > 0 && d->statusCode == 200); } void QHttpNetworkReply::setUserProvidedDownloadBuffer(char* b) @@ -672,7 +672,7 @@ qint64 QHttpNetworkReplyPrivate::readBodyVeryFast(QAbstractSocket *socket, char qint64 haveRead = 0; haveRead = socket->read(b, bodyLength - contentRead); if (haveRead == -1) { - return 0; // ### error checking here; + return -1; } contentRead += haveRead; |