Use setHeader instead of setRawHeader for the user agent
authorKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 7 Oct 2020 09:40:56 +0000 (11:40 +0200)
committerKevin Ottens (Rebase PR Action) <er-vin@users.noreply.github.com>
Thu, 8 Oct 2020 05:55:47 +0000 (05:55 +0000)
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
src/gui/creds/flow2auth.cpp
src/libsync/accessmanager.cpp

index 790318e835fcebe6529ca5973773eef58af5efab..bfdc21047df743118e03fb3e76104af16c6ac12a 100644 (file)
@@ -82,7 +82,7 @@ void Flow2Auth::fetchNewToken(const TokenAction action)
     // add 'Content-Length: 0' header (see https://github.com/nextcloud/desktop/issues/1473)
     QNetworkRequest req;
     req.setHeader(QNetworkRequest::ContentLengthHeader, "0");
-    req.setRawHeader("User-Agent", Utility::friendlyUserAgentString());
+    req.setHeader(QNetworkRequest::UserAgentHeader, Utility::friendlyUserAgentString());
 
     auto job = _account->sendRequest("POST", url, req);
     job->setTimeout(qMin(30 * 1000ll, job->timeoutMsec()));
index ab71822cbfec074a4ef1d2ece31b74d9857dfa90..50107609e5395fbf1387f100b9730502773543df 100644 (file)
@@ -77,8 +77,8 @@ QNetworkReply *AccessManager::createRequest(QNetworkAccessManager::Operation op,
     }
 
     // Respect request specific user agent if any
-    if (!newRequest.hasRawHeader(QByteArrayLiteral("User-Agent"))) {
-        newRequest.setRawHeader(QByteArray("User-Agent"), Utility::userAgentString());
+    if (!newRequest.header(QNetworkRequest::UserAgentHeader).isValid()) {
+        newRequest.setHeader(QNetworkRequest::UserAgentHeader, Utility::userAgentString());
     }
 
     // Some firewalls reject requests that have a "User-Agent" but no "Accept" header