diff options
| author | Vladimir Belyavsky <belyavskyv@gmail.com> | 2023-06-14 19:12:36 +0300 |
|---|---|---|
| committer | Vladimir Belyavsky <belyavskyv@gmail.com> | 2023-07-04 01:18:47 +0300 |
| commit | add2620e2e710bd2f594973f22f048314d7060d8 (patch) | |
| tree | ef7482868cbf353438d94454d51937faa8334e0e /src/quick/util/qquickpixmapcache.cpp | |
| parent | dbd1eee858319cd3b5a02ae6422a70f1bae572fa (diff) | |
QQuickPixmap: get rid of manual processing of HTTP redirects
Since d12afeff4097dd78f1311511e0c8f74e1a810d47 (Qt 6.0) QNAM has started
internal processing of HTTP redirects by default. So it seems we can
simply get rid of manual processing of HTTP redirects on Qt Quick level.
Moreover it looks like we never even reached this code since Qt 6.0.
Change-Id: I07347d3a4fb13598a8dda69085e5db9a6eaeaf85
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/util/qquickpixmapcache.cpp')
| -rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index eccfc41b6b..f6e1f9177a 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -37,7 +37,6 @@ #endif #define IMAGEREQUEST_MAX_NETWORK_REQUEST_COUNT 8 -#define IMAGEREQUEST_MAX_REDIRECT_RECURSION 16 #define CACHE_EXPIRE_TIME 30 #define CACHE_REMOVAL_FRACTION 4 @@ -144,7 +143,6 @@ public: bool loading; QQuickImageProviderOptions providerOptions; - int redirectCount; class Event : public QEvent { public: @@ -653,28 +651,6 @@ void QQuickPixmapReader::networkRequestDone(QNetworkReply *reply) QQuickPixmapReply *job = networkJobs.take(reply); if (job) { - job->redirectCount++; - if (job->redirectCount < IMAGEREQUEST_MAX_REDIRECT_RECURSION) { - QVariant redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute); - if (redirect.isValid()) { - QUrl url = reply->url().resolved(redirect.toUrl()); - QNetworkRequest req(url); - req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true); - - reply->deleteLater(); - reply = networkAccessManager()->get(req); - - QMetaObject::connect(reply, replyDownloadProgressMethodIndex, job, - downloadProgressMethodIndex); - QMetaObject::connect(reply, replyFinishedMethodIndex, - readerThreadExecutionEnforcer(), - threadNetworkRequestDoneMethodIndex); - - networkJobs.insert(reply, job); - return; - } - } - QImage image; QQuickPixmapReply::ReadError error = QQuickPixmapReply::NoError; QString errorString; @@ -1358,7 +1334,7 @@ void QQuickPixmap::purgeCache() QQuickPixmapReply::QQuickPixmapReply(QQuickPixmapData *d) : data(d), engineForReader(nullptr), requestRegion(d->requestRegion), requestSize(d->requestSize), - url(d->url), loading(false), providerOptions(d->providerOptions), redirectCount(0) + url(d->url), loading(false), providerOptions(d->providerOptions) { if (finishedMethodIndex == -1) { finishedMethodIndex = QMetaMethod::fromSignal(&QQuickPixmapReply::finished).methodIndex(); |