From 3e25d09b08cc817f8f991fbf2420618516dd9061 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 12 Aug 2020 09:53:16 +0200
Subject: [PATCH] QDecompressHelper: Change order of encodings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before the introduction of QDecompressHelper gzip was preferred over
deflate. The change seems to be accidental. Amends commit
7b76379a89158f10780cbfc74965027246faec68.

Change-Id: I70f33d551912465d63f49ea3db1ac3575d19a92d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/network/access/qdecompresshelper.cpp                        | 2 +-
 .../network/access/qdecompresshelper/tst_qdecompresshelper.cpp  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/network/access/qdecompresshelper.cpp b/src/network/access/qdecompresshelper.cpp
index e56a411fc1..4fbb2d8889 100644
--- a/src/network/access/qdecompresshelper.cpp
+++ b/src/network/access/qdecompresshelper.cpp
@@ -59,8 +59,8 @@ struct ContentEncodingMapping
 };
 
 constexpr ContentEncodingMapping contentEncodingMapping[] {
-    { "deflate", QDecompressHelper::Deflate },
     { "gzip", QDecompressHelper::GZip },
+    { "deflate", QDecompressHelper::Deflate },
 #if QT_CONFIG(brotli)
     { "br", QDecompressHelper::Brotli },
 #endif
diff --git a/tests/auto/network/access/qdecompresshelper/tst_qdecompresshelper.cpp b/tests/auto/network/access/qdecompresshelper/tst_qdecompresshelper.cpp
index a1fbe60d3e..2641c65497 100644
--- a/tests/auto/network/access/qdecompresshelper/tst_qdecompresshelper.cpp
+++ b/tests/auto/network/access/qdecompresshelper/tst_qdecompresshelper.cpp
@@ -90,6 +90,8 @@ void tst_QDecompressHelper::encodingSupported()
     QVERIFY(accepted.contains("gzip"));
     int expected = 2;
 
+    QVERIFY(accepted.indexOf("gzip") < accepted.indexOf("deflate"));
+
 #if QT_CONFIG(brotli)
     QVERIFY(QDecompressHelper::isSupportedEncoding("br"));
     QVERIFY(accepted.contains("br"));