gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-25 19:04:48 -08:00
Code Issues Packages Projects Releases Wiki Activity

detect recursive redirects (#6570)

Browse Source 
* detect recursive redirects

* handle failure with normal failure handler
This commit is contained in:
ebbit1q
2026-01-25 22:05:19 +01:00
committed by GitHub
parent c02cf5e89e
commit 303bd8b607
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
View File

@@ -70,16 +70,22 @@ void CardPictureLoaderWorkerWork::picDownloadFailed()
void CardPictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply)
{
QVariant redirectTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
bool redirectFailure = false;
if (redirectTarget.isValid()) {
QUrl url = reply->request().url();
QUrl redirectUrl = redirectTarget.toUrl();
if (redirectUrl.isRelative()) {
redirectUrl = url.resolved(redirectUrl);
}
emit urlRedirected(url, redirectUrl);
if (url == redirectUrl) {
qCWarning(CardPictureLoaderWorkerWorkLog) << "recusive redirect detected!";
redirectFailure = true;
} else {
emit urlRedirected(url, redirectUrl);
}
}
if (reply->error()) {
if (redirectFailure || reply->error()) {
handleFailedReply(reply);
} else {
handleSuccessfulReply(reply);