diff options
| author | Vladimir Belyavsky <belyavskyv@gmail.com> | 2023-06-14 19:15:39 +0300 |
|---|---|---|
| committer | Vladimir Belyavsky <belyavskyv@gmail.com> | 2023-06-15 21:31:01 +0300 |
| commit | 5c62beb3f689b74cf45c726f410d90378fc72860 (patch) | |
| tree | 294df4bd89d24e100ba7755afb89109816cd3966 /src/qml/jsruntime/qv4include.cpp | |
| parent | eed2ee69ac291da33c48093bc2c2bc4d359f46a2 (diff) | |
QV4Include: 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: I46b83b0077883c1d8c407996f9ff9bfef4447b8d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4include.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 67572b50a9..76545ba692 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -26,7 +26,7 @@ QV4Include::QV4Include(const QUrl &url, QV4::ExecutionEngine *engine, : QObject(engine->jsEngine()) , v4(engine), m_url(url) #if QT_CONFIG(qml_network) - , m_redirectCount(0), m_network(nullptr) , m_reply(nullptr) + , m_network(nullptr) , m_reply(nullptr) #endif { if (qmlContext) @@ -104,27 +104,9 @@ QV4::ReturnedValue QV4Include::result() return m_resultObject.value(); } -#define INCLUDE_MAXIMUM_REDIRECT_RECURSION 15 void QV4Include::finished() { #if QT_CONFIG(qml_network) - m_redirectCount++; - - if (m_redirectCount < INCLUDE_MAXIMUM_REDIRECT_RECURSION) { - QVariant redirect = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute); - if (redirect.isValid()) { - m_url = m_url.resolved(redirect.toUrl()); - delete m_reply; - - QNetworkRequest request; - request.setUrl(m_url); - - m_reply = m_network->get(request); - QObject::connect(m_reply, SIGNAL(finished()), this, SLOT(finished())); - return; - } - } - QV4::Scope scope(v4); QV4::ScopedObject resultObj(scope, m_resultObject.value()); QV4::ScopedString status(scope, v4->newString(QStringLiteral("status"))); |