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

qhttpnetworkconnection: extract method makeAcceptLanguage

Browse Source 
and micro optimize it:
- avoid allocation in case of C locale
- don't call replace in case of C locale

Change-Id: I9afefd53b673e5f1236afdb3130d77779614acc7
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Anton Kudryavtsev 2023-09-01 17:08:27 +03:00
parent 43d15dd572
commit 50fa7996d0
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/access/qhttpnetworkconnection.cpp
View File

@ -226,6 +226,17 @@ qint64 QHttpNetworkConnectionPrivate::uncompressedBytesAvailableNextBlock(const
return reply.d_func()->responseData.sizeNextBlock();
}
static QByteArray makeAcceptLanguage()
{
QString systemLocale = QLocale::system().name();
if (systemLocale == "C"_L1)
return "en,*"_ba;
systemLocale.replace('_'_L1, '-'_L1);
if (systemLocale.startsWith("en-"_L1))
return (systemLocale + ",*"_L1).toLatin1();
return (systemLocale + ",en,*"_L1).toLatin1();
}
void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair)
{
QHttpNetworkRequest &request = messagePair.first;
@ -290,17 +301,8 @@ void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair)
// not with us, but we work around this by setting
// one always.
value = request.headerField("accept-language");
if (value.isEmpty()) {
QString systemLocale = QLocale::system().name().replace(QChar::fromLatin1('_'),QChar::fromLatin1('-'));
QString acceptLanguage;
if (systemLocale == "C"_L1)
acceptLanguage = QString::fromLatin1("en,*");
else if (systemLocale.startsWith("en-"_L1))
acceptLanguage = systemLocale + ",*"_L1;
else
acceptLanguage = systemLocale + ",en,*"_L1;
request.setHeaderField("Accept-Language", std::move(acceptLanguage).toLatin1());
}
if (value.isEmpty())
request.setHeaderField("Accept-Language", makeAcceptLanguage());
// set the User Agent
value = request.headerField("user-agent");