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

qnetworkreplyhttpimpl: use QBAV more

Browse Source 
Change-Id: Ieee68c06962da7c12af2b4145495b3d5ba5a02fb
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Anton Kudryavtsev 2023-08-31 19:03:53 +03:00 committed by Anton Kudryavtsev
parent 0b512d7f41
commit 7cccbae61f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/access/qnetworkreplyhttpimpl.cpp
View File

@ -39,6 +39,7 @@ class QNetworkProxy;
static inline QByteArray rangeName() { return "Range"_ba; } static inline QByteArray rangeName() { return "Range"_ba; }
static inline QByteArray cacheControlName() { return "Cache-Control"_ba; } static inline QByteArray cacheControlName() { return "Cache-Control"_ba; }
static constexpr QByteArrayView bytesEqualPrefix() noexcept { return "bytes="; }
// ### merge with nextField in cookiejar.cpp // ### merge with nextField in cookiejar.cpp
static QHash<QByteArray, QByteArray> parseHttpOptionHeader(QByteArrayView header) static QHash<QByteArray, QByteArray> parseHttpOptionHeader(QByteArrayView header)
@ -746,7 +747,8 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
headers.removeAt(rangeIndex); headers.removeAt(rangeIndex);
// We've already verified that requestRange starts with "bytes=", see canResume. // We've already verified that requestRange starts with "bytes=", see canResume.
QByteArray requestRange = newHttpRequest.rawHeader(rangeName()).mid(6); const auto rangeHeader = newHttpRequest.rawHeader(rangeName());
const auto requestRange = QByteArrayView(rangeHeader).mid(bytesEqualPrefix().size());
int index = requestRange.indexOf('-'); int index = requestRange.indexOf('-');
@ -754,12 +756,12 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
quint64 requestEndOffset = requestRange.mid(index + 1).toULongLong(); quint64 requestEndOffset = requestRange.mid(index + 1).toULongLong();
// In case an end offset is not given it is skipped from the request range // In case an end offset is not given it is skipped from the request range
requestRange = "bytes=" + QByteArray::number(resumeOffset + requestStartOffset) + QByteArray newRange = bytesEqualPrefix() + QByteArray::number(resumeOffset + requestStartOffset) +
'-' + (requestEndOffset ? QByteArray::number(requestEndOffset) : QByteArray()); '-' + (requestEndOffset ? QByteArray::number(requestEndOffset) : QByteArray());
httpRequest.setHeaderField(rangeName(), requestRange); httpRequest.setHeaderField(rangeName(), newRange);
} else { } else {
httpRequest.setHeaderField(rangeName(), "bytes=" + QByteArray::number(resumeOffset) + '-'); httpRequest.setHeaderField(rangeName(), bytesEqualPrefix() + QByteArray::number(resumeOffset) + '-');
} }
} }
@ -1854,7 +1856,7 @@ bool QNetworkReplyHttpImplPrivate::canResume() const
// We only support resuming for byte ranges. // We only support resuming for byte ranges.
if (request.hasRawHeader(rangeName())) { if (request.hasRawHeader(rangeName())) {
QByteArray range = request.rawHeader(rangeName()); QByteArray range = request.rawHeader(rangeName());
if (!range.startsWith("bytes=")) if (!range.startsWith(bytesEqualPrefix()))
return false; return false;
} }