diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2020-11-28 16:09:45 +0100 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2020-11-28 16:09:45 +0100 |
commit | f9725638efd4cc405400e7f2e490b507da3bb08c (patch) | |
tree | 1c5e12e950d5ab9bd86dccc18c127eca26d90999 /src/network | |
parent | aeb86a62396802f9e357fbfa0ef420a1f25565a9 (diff) | |
parent | 04f39ec8d636d96043485247f565bfe0b35529e5 (diff) |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
# Conflicts:
# CMakeLists.txt
# src/network/jsonwebtask.cpp
# src/util/logging.cpp
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/jsonwebtask.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/network/jsonwebtask.cpp b/src/network/jsonwebtask.cpp index 74a30e5fbc..7f566e7168 100644 --- a/src/network/jsonwebtask.cpp +++ b/src/network/jsonwebtask.cpp @@ -92,8 +92,12 @@ bool readJsonContent( QNetworkRequest newRequest( const QUrl& url) { QNetworkRequest request(url); - request.setHeader(QNetworkRequest::ContentTypeHeader, JSON_CONTENT_TYPE); - request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); + request.setHeader( + QNetworkRequest::ContentTypeHeader, + JSON_CONTENT_TYPE); + request.setAttribute( + QNetworkRequest::RedirectPolicyAttribute, + QNetworkRequest::NoLessSafeRedirectPolicy); return request; } |