From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Tue, 6 Oct 2020 14:54:07 +0000 (+0200)
Subject: Don't force user agent if one is already set on the request
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~119^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=50dd715f4deba54ee72cac13f2155a4d6a44746e;p=nextcloud-desktop.git

Don't force user agent if one is already set on the request

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp
index 8cba1a71d..ab71822cb 100644
--- a/src/libsync/accessmanager.cpp
+++ b/src/libsync/accessmanager.cpp
@@ -76,7 +76,10 @@ QNetworkReply *AccessManager::createRequest(QNetworkAccessManager::Operation op,
         setRawCookie(request.rawHeader("cookie"), request.url());
     }
 
-    newRequest.setRawHeader(QByteArray("User-Agent"), Utility::userAgentString());
+    // Respect request specific user agent if any
+    if (!newRequest.hasRawHeader(QByteArrayLiteral("User-Agent"))) {
+        newRequest.setRawHeader(QByteArray("User-Agent"), Utility::userAgentString());
+    }
 
     // Some firewalls reject requests that have a "User-Agent" but no "Accept" header
     newRequest.setRawHeader(QByteArray("Accept"), "*/*");