From: Kevin Ottens Date: Wed, 7 Oct 2020 09:40:56 +0000 (+0200) Subject: Use setHeader instead of setRawHeader for the user agent X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~119^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab67741d879ce5add607ad281ebc1b451ac763f9;p=nextcloud-desktop.git Use setHeader instead of setRawHeader for the user agent Signed-off-by: Kevin Ottens --- diff --git a/src/gui/creds/flow2auth.cpp b/src/gui/creds/flow2auth.cpp index 790318e83..bfdc21047 100644 --- a/src/gui/creds/flow2auth.cpp +++ b/src/gui/creds/flow2auth.cpp @@ -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())); diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp index ab71822cb..50107609e 100644 --- a/src/libsync/accessmanager.cpp +++ b/src/libsync/accessmanager.cpp @@ -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