Set QNetworkRequest::RedirectPolicyAttribute with Qt >= 5.9

This commit is contained in:
Jonas Kvinge
2020-08-14 20:20:41 +02:00
parent aeee7c02d5
commit 0788981783
27 changed files with 155 additions and 2 deletions

View File

@@ -94,7 +94,11 @@ QNetworkReply *SubsonicBaseRequest::CreateGetRequest(const QString &ressource_na
}
req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#else
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
QNetworkReply *reply = network_->get(req);
connect(reply, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(HandleSSLErrors(QList<QSslError>)));

View File

@@ -710,7 +710,11 @@ void SubsonicRequest::FlushAlbumCoverRequests() {
++album_covers_requests_active_;
QNetworkRequest req(request.url);
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#else
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
if (!verify_certificate()) {
QSslConfiguration sslconfig = QSslConfiguration::defaultConfiguration();

View File

@@ -76,6 +76,10 @@ SubsonicService::SubsonicService(Application *app, QObject *parent)
ping_redirects_(0)
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
network_->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
#endif
app->player()->RegisterUrlHandler(url_handler_);
// Backend
@@ -182,6 +186,12 @@ void SubsonicService::SendPing(QUrl url, const QString &username, const QString
req.setSslConfiguration(sslconfig);
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#else
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
errors_.clear();