QNAM: Direct transfer of HTTP buffer to the QNetworkReply buffer

Directly put a QRingBuffer from one QRingBuffer to
another QRingBuffer.

Reviewed-by: Thiago Macieira

1 files changed, 7 insertions, 9 deletions

diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 71808d4..db84e58 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -649,16 +649,14 @@ void QNetworkAccessHttpBackend::readFromHttp()
     if (!httpReply)
         return;
 
-    // We implement the download rate control
-    // Don't read from QHttpNetworkAccess more than QNetworkAccessBackend wants
-    // One of the two functions above will be called when we can read again
+    // We read possibly more than nextDownstreamBlockSize(), but
+    // this is not a critical thing since it is already in the
+    // memory anyway
 
-    qint64 bytesToRead = qBound<qint64>(0, httpReply->bytesAvailable(), nextDownstreamBlockSize());
-    if (!bytesToRead)
-        return;
-
-    QByteArray data = httpReply->read(bytesToRead);
-    writeDownstreamData(data);
+    while (httpReply->bytesAvailable() != 0 && nextDownstreamBlockSize() != 0) {
+        const QByteArray data = httpReply->readAny();
+        writeDownstreamData(data);
+    }
 }
 
 void QNetworkAccessHttpBackend::replyFinished()