AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qnetworkrequest: extract method

Browse Source 
De-duplicate code for cookie header making

Change-Id: I3ac59445089ee151a2f719454fa50cb9f37f72e4
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Anton Kudryavtsev 2023-08-30 11:41:30 +03:00
parent 514a6776e1
commit e84d9ea5e6
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/network/access/qnetworkrequest.cpp
View File

@ -1056,6 +1056,22 @@ static QByteArray headerName(QNetworkRequest::KnownHeaders header)
return QByteArray();
}
static QByteArray makeCookieHeader(const QVariant &value, QNetworkCookie::RawForm type, QByteArrayView separator)
{
QList<QNetworkCookie> cookies = qvariant_cast<QList<QNetworkCookie> >(value);
if (cookies.isEmpty() && value.userType() == qMetaTypeId<QNetworkCookie>())
cookies << qvariant_cast<QNetworkCookie>(value);
QByteArray result;
for (const QNetworkCookie &cookie : std::as_const(cookies)) {
result += cookie.toRawForm(type);
result += separator;
}
if (!result.isEmpty())
result.chop(separator.size());
return result;
}
static QByteArray headerValue(QNetworkRequest::KnownHeaders header, const QVariant &value)
{
switch (header) {
@ -1091,37 +1107,11 @@ static QByteArray headerValue(QNetworkRequest::KnownHeaders header, const QVaria
return value.toByteArray();
}
case QNetworkRequest::CookieHeader: {
QList<QNetworkCookie> cookies = qvariant_cast<QList<QNetworkCookie> >(value);
if (cookies.isEmpty() && value.userType() == qMetaTypeId<QNetworkCookie>())
cookies << qvariant_cast<QNetworkCookie>(value);
case QNetworkRequest::CookieHeader:
return makeCookieHeader(value, QNetworkCookie::NameAndValueOnly, "; ");
constexpr QByteArrayView separator = "; ";
QByteArray result;
for (const QNetworkCookie &cookie : std::as_const(cookies)) {
result += cookie.toRawForm(QNetworkCookie::NameAndValueOnly);
result += separator;
}
if (!result.isEmpty())
result.chop(separator.size());
return result;
}
case QNetworkRequest::SetCookieHeader: {
QList<QNetworkCookie> cookies = qvariant_cast<QList<QNetworkCookie> >(value);
if (cookies.isEmpty() && value.userType() == qMetaTypeId<QNetworkCookie>())
cookies << qvariant_cast<QNetworkCookie>(value);
\
constexpr QByteArrayView separator = ", ";
QByteArray result;
for (const QNetworkCookie &cookie : std::as_const(cookies)) {
result += cookie.toRawForm(QNetworkCookie::Full);
result += separator;
}
if (!result.isEmpty())
result.chop(separator.size());
return result;
}
case QNetworkRequest::SetCookieHeader:
return makeCookieHeader(value, QNetworkCookie::Full, ", ");
}
return QByteArray();