Skip to content

Commit dd888a1

Browse files
authored
Merge pull request #7720 from PatrickJosh/master
Make extraction of ETag header independent of capitalisation
2 parents 9a0c501 + 80b6d0e commit dd888a1

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/gui/ocsjob.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ bool OcsJob::finished()
139139

140140
} else {
141141
// save new ETag value
142-
if(reply()->rawHeaderList().contains("ETag"))
143-
emit etagResponseHeaderReceived(reply()->rawHeader("ETag"), statusCode);
142+
if (const auto etagHeader = reply()->header(QNetworkRequest::ETagHeader); etagHeader.isValid()) {
143+
emit etagResponseHeaderReceived(etagHeader.toByteArray(), statusCode);
144+
}
144145

145146
emit jobFinished(json, statusCode);
146147
}

src/libsync/networkjobs.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -999,8 +999,9 @@ bool JsonApiJob::finished()
999999
}
10001000

10011001
// save new ETag value
1002-
if(reply()->rawHeaderList().contains("ETag"))
1003-
emit etagResponseHeaderReceived(reply()->rawHeader("ETag"), statusCode);
1002+
if (const auto etagHeader = reply()->header(QNetworkRequest::ETagHeader); etagHeader.isValid()) {
1003+
emit etagResponseHeaderReceived(etagHeader.toByteArray(), statusCode);
1004+
}
10041005

10051006
QJsonParseError error{};
10061007
auto json = QJsonDocument::fromJson(jsonStr.toUtf8(), &error);

0 commit comments

Comments
 (0)