Merge pull request #7720 from PatrickJosh/master

Make extraction of ETag header independent of capitalisation
nextcloud · Jan 7, 2025 · dd888a1 · dd888a1
2 parents 9a0c501 + 80b6d0e
commit dd888a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/gui/ocsjob.cpp b/src/gui/ocsjob.cpp
@@ -139,8 +139,9 @@ bool OcsJob::finished()
 
     } else {
         // save new ETag value
-        if(reply()->rawHeaderList().contains("ETag"))
-            emit etagResponseHeaderReceived(reply()->rawHeader("ETag"), statusCode);
+        if (const auto etagHeader = reply()->header(QNetworkRequest::ETagHeader); etagHeader.isValid()) {
+            emit etagResponseHeaderReceived(etagHeader.toByteArray(), statusCode);
+        }
 
         emit jobFinished(json, statusCode);
     }

diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
@@ -999,8 +999,9 @@ bool JsonApiJob::finished()
     }
 
     // save new ETag value
-    if(reply()->rawHeaderList().contains("ETag"))
-        emit etagResponseHeaderReceived(reply()->rawHeader("ETag"), statusCode);
+    if (const auto etagHeader = reply()->header(QNetworkRequest::ETagHeader); etagHeader.isValid()) {
+        emit etagResponseHeaderReceived(etagHeader.toByteArray(), statusCode);
+    }
 
     QJsonParseError error{};
     auto json = QJsonDocument::fromJson(jsonStr.toUtf8(), &error);