From 80b6d0e9612aafac629bd3405dfb0fc97b1175ed Mon Sep 17 00:00:00 2001 From: Joshua Noeske Date: Sat, 4 Jan 2025 19:56:41 +0100 Subject: [PATCH] Make extraction of ETag header independent of capitalisation. Fixes #7703. Signed-off-by: Joshua Noeske --- src/gui/ocsjob.cpp | 5 +++-- src/libsync/networkjobs.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/ocsjob.cpp b/src/gui/ocsjob.cpp index 09f7de00c0f1e..487d283a428ce 100644 --- 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 index 1cde1a2c15a00..3369050033374 100644 --- 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);