Merge pull request #7720 from PatrickJosh/master

Make extraction of ETag header independent of capitalisation
This commit is contained in:
Matthieu Gallien 2025-01-07 10:55:34 +01:00 committed by GitHub
commit dd888a1252
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions

View File

@ -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);
}

View File

@ -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);