Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: Ied1194730e75a6f30839bbf5429aa2699230288e

1 files changed, 5 insertions, 5 deletions

diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 8750a841f6..ed2235ad28 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -1676,13 +1676,13 @@ QNetworkCacheMetaData QNetworkReplyHttpImplPrivate::fetchCacheMetaData(const QNe
                 || header == "content-range"
                 || header == "content-type")
                 continue;
-
-            // For MS servers that send "Content-Length: 0" on 304 responses
-            // ignore this too
-            if (header == "content-length")
-                continue;
         }
 
+        // IIS has been known to send "Content-Length: 0" on 304 responses, so
+        // ignore this too
+        if (header == "content-length" && statusCode == 304)
+            continue;
+
 #if defined(QNETWORKACCESSHTTPBACKEND_DEBUG)
         QByteArray n = q->rawHeader(header);
         QByteArray o;