// the buffer in that size.
// note that this call will read only from the still buffered data
qint64 haveRead = replyPrivate->readBodyVeryFast(socket, replyPrivate->userProvidedDownloadBuffer + replyPrivate->totalProgress);
- bytes += haveRead;
- replyPrivate->totalProgress += haveRead;
-
- // the user will get notified of it via progress signal
- if (haveRead > 0)
+ if (haveRead > 0) {
+ bytes += haveRead;
+ replyPrivate->totalProgress += haveRead;
+ // the user will get notified of it via progress signal
emit reply->dataReadProgress(replyPrivate->totalProgress, replyPrivate->bodyLength);
+ } else if (haveRead == 0) {
+ // Happens since this called in a loop. Currently no bytes available.
+ } else if (haveRead < 0) {
+ connection->d_func()->emitReplyError(socket, reply, QNetworkReply::RemoteHostClosedError);
+ break;
+ }
} else if (!replyPrivate->isChunked() && !replyPrivate->autoDecompress
&& replyPrivate->bodyLength > 0) {
// bulk files like images should fulfill these properties and
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)
qint64 haveRead = 0;
haveRead = socket->read(b, bodyLength - contentRead);
if (haveRead == -1) {
- return 0; // ### error checking here;
+ return -1;
}
contentRead += haveRead;
if (!synchronous) {
// Tell our zerocopy policy to the delegate
- delegate->downloadBufferMaximumSize =
- request.attribute(QNetworkRequest::MaximumDownloadBufferSizeAttribute).toLongLong();
+ QVariant downloadBufferMaximumSizeAttribute = request.attribute(QNetworkRequest::MaximumDownloadBufferSizeAttribute);
+ if (downloadBufferMaximumSizeAttribute.isValid()) {
+ delegate->downloadBufferMaximumSize = downloadBufferMaximumSizeAttribute.toLongLong();
+ } else {
+ // If there is no MaximumDownloadBufferSizeAttribute set (which is for the majority
+ // of QNetworkRequest) then we can assume we'll do it anyway for small HTTP replies.
+ // This helps with performance and memory fragmentation.
+ delegate->downloadBufferMaximumSize = 128*1024;
+ }
+
// These atomic integers are used for signal compression
delegate->pendingDownloadData = pendingDownloadDataEmissions;