QNetworkReply: honor legacy behavior of setting Accept-Encoding

And don't decompress the data

Pick-to: 6.4
Fixes: QTBUG-106689
Change-Id: I93a96be8178e24ff0b0bb8647276828161445cf5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

1 files changed, 51 insertions, 12 deletions

diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 1ab3cb97f5..e653ebf698 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -9669,25 +9669,53 @@ void tst_QNetworkReply::contentEncoding_data()
     QTest::addColumn<QByteArray>("encoding");
     QTest::addColumn<QByteArray>("body");
     QTest::addColumn<QByteArray>("expected");
+    QTest::addColumn<bool>("decompress");
 
+    const QByteArray helloWorld = "hello world";
+
+    const QByteArray gzipBody = QByteArray::fromBase64("H4sIAAAAAAAAA8tIzcnJVyjPL8pJAQCFEUoNCwAAAA==");
     QTest::newRow("gzip-hello-world")
             << QByteArray("gzip")
-            << QByteArray::fromBase64("H4sIAAAAAAAAA8tIzcnJVyjPL8pJAQCFEUoNCwAAAA==")
-            << QByteArray("hello world");
+            << gzipBody
+            << helloWorld
+            << true;
+    QTest::newRow("gzip-hello-world-no-decompress")
+            << QByteArray("gzip")
+            << gzipBody
+            << helloWorld
+            << false;
+    const QByteArray deflateBody = QByteArray::fromBase64("eJzLSM3JyVcozy/KSQEAGgsEXQ==");
     QTest::newRow("deflate-hello-world")
-            << QByteArray("deflate") << QByteArray::fromBase64("eJzLSM3JyVcozy/KSQEAGgsEXQ==")
-            << QByteArray("hello world");
+            << QByteArray("deflate") << deflateBody
+            << helloWorld
+            << true;
+    QTest::newRow("deflate-hello-world-no-decompress")
+            << QByteArray("deflate") << deflateBody
+            << helloWorld
+            << false;
 
 #if QT_CONFIG(brotli)
+    const QByteArray brotliBody = QByteArray::fromBase64("DwWAaGVsbG8gd29ybGQD");
     QTest::newRow("brotli-hello-world")
-            << QByteArray("br") << QByteArray::fromBase64("DwWAaGVsbG8gd29ybGQD")
-            << QByteArray("hello world");
+            << QByteArray("br") << brotliBody
+            << helloWorld
+            << true;
+    QTest::newRow("brotli-hello-world-no-decompress")
+            << QByteArray("br") << brotliBody
+            << helloWorld
+            << false;
 #endif
 
 #if defined(QT_BUILD_INTERNAL) && QT_CONFIG(zstd)
+    const QByteArray zstdBody = QByteArray::fromBase64("KLUv/QRYWQAAaGVsbG8gd29ybGRoaR6y");
     QTest::newRow("zstandard-hello-world")
-            << QByteArray("zstd") << QByteArray::fromBase64("KLUv/QRYWQAAaGVsbG8gd29ybGRoaR6y")
-            << QByteArray("hello world");
+            << QByteArray("zstd") << zstdBody
+            << helloWorld
+            << true;
+    QTest::newRow("zstandard-hello-world-no-decompress")
+            << QByteArray("zstd") << zstdBody
+            << helloWorld
+            << false;
 #else
     qDebug("Note: ZStandard testdata is only available for developer builds.");
 #endif
@@ -9697,12 +9725,19 @@ void tst_QNetworkReply::contentEncoding()
 {
     QFETCH(QByteArray, encoding);
     QFETCH(QByteArray, body);
+    QFETCH(bool, decompress);
     QString header("HTTP/1.0 200 OK\r\nContent-Encoding: %1\r\nContent-Length: %2\r\n\r\n");
     header = header.arg(encoding, QString::number(body.size()));
 
     MiniHttpServer server(header.toLatin1() + body);
 
     QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort())));
+    if (!decompress) {
+        // This disables decompression of the received content:
+        request.setRawHeader("Accept-Encoding", QLatin1String("%1").arg(encoding).toLatin1());
+        // This disables the zerocopy optimization
+        request.setAttribute(QNetworkRequest::MaximumDownloadBufferSizeAttribute, 0);
+    }
     QNetworkReplyPtr reply(manager.get(request));
 
     QVERIFY2(waitForFinish(reply) == Success, msgWaitForFinished(reply));
@@ -9723,10 +9758,14 @@ void tst_QNetworkReply::contentEncoding()
         QVERIFY2(list.contains(encoding), acceptedEncoding.data());
     }
 
-    QFETCH(QByteArray, expected);
-
-    QCOMPARE(reply->bytesAvailable(), expected.size());
-    QCOMPARE(reply->readAll(), expected);
+    if (decompress) {
+        QFETCH(QByteArray, expected);
+        QCOMPARE(reply->bytesAvailable(), expected.size());
+        QCOMPARE(reply->readAll(), expected);
+    } else {
+        QCOMPARE(reply->bytesAvailable(), body.size());
+        QCOMPARE(reply->readAll(), body);
+    }
 }
 
 void tst_QNetworkReply::contentEncodingBigPayload_data()