From 0fef8f53c3e52dd31648c55a2376006f223a7054 Mon Sep 17 00:00:00 2001 From: Lena Biliaieva Date: Wed, 3 Apr 2024 20:56:29 +0200 Subject: Use QHttpHeaders: Update internal users of QNRequest, QNReply, QNProxy Replace QNetworkHeadersPrivate's main headers storage, which was RawHeadersList, with QHttpHeaders. Replace internal usage of raw and cooked header methods with the QHttpHeaders API. [ChangeLog][QtNetwork][QNetworkRequest] Header value added by QNetworkRequest::setRawHeader() method is trimmed now. Task-number: QTBUG-107751 Change-Id: I8882978afa430651e6c798a4fed00beef6c4cfd2 Reviewed-by: Juha Vuolle --- src/network/access/qnetworkfile.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/network/access/qnetworkfile.cpp') diff --git a/src/network/access/qnetworkfile.cpp b/src/network/access/qnetworkfile.cpp index bfedf044de..fb9ce8232d 100644 --- a/src/network/access/qnetworkfile.cpp +++ b/src/network/access/qnetworkfile.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qnetworkfile_p.h" +#include "qnetworkrequest_p.h" #include #include @@ -31,8 +32,10 @@ void QNetworkFile::open() "Cannot open %1: Path is a directory").arg(fileName()); emit error(QNetworkReply::ContentOperationNotPermittedError, msg); } else { - emit headerRead(QNetworkRequest::LastModifiedHeader, QVariant::fromValue(fi.lastModified())); - emit headerRead(QNetworkRequest::ContentLengthHeader, QVariant::fromValue(fi.size())); + emit headerRead(QHttpHeaders::WellKnownHeader::LastModified, + QNetworkHeadersPrivate::toHttpDate(fi.lastModified())); + emit headerRead(QHttpHeaders::WellKnownHeader::ContentLength, + QByteArray::number(fi.size())); opened = QFile::open(QIODevice::ReadOnly | QIODevice::Unbuffered); if (!opened) { QString msg = QCoreApplication::translate("QNetworkAccessFileBackend", -- cgit v1.2.3