1 files changed, 35 insertions, 7 deletions
diff --git a/src/network/access/qnetworkrequest_p.h b/src/network/access/qnetworkrequest_p.h
index 57fb7b35be..7268e1a4aa 100644
--- a/src/network/access/qnetworkrequest_p.h
+++ b/src/network/access/qnetworkrequest_p.h
@@ -16,6 +16,7 @@
 //
 
 #include <QtNetwork/private/qtnetworkglobal_p.h>
+#include <QtNetwork/qhttpheaders.h>
 #include "qnetworkrequest.h"
 #include "QtCore/qbytearray.h"
 #include "QtCore/qlist.h"
@@ -26,6 +27,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QNetworkCookie;
+
 // this is the common part between QNetworkRequestPrivate, QNetworkReplyPrivate and QHttpPartPrivate
 class QNetworkHeadersPrivate
 {
@@ -35,24 +38,49 @@ public:
     typedef QHash<QNetworkRequest::KnownHeaders, QVariant> CookedHeadersMap;
     typedef QHash<QNetworkRequest::Attribute, QVariant> AttributesMap;
 
-    RawHeadersList rawHeaders;
+    mutable struct {
+        RawHeadersList headersList;
+        bool isCached = false;
+    } rawHeaderCache;
+
+    QHttpHeaders httpHeaders;
     CookedHeadersMap cookedHeaders;
     AttributesMap attributes;
     QPointer<QObject> originatingObject;
 
-    RawHeadersList::ConstIterator findRawHeader(const QByteArray &key) const;
-    RawHeadersList allRawHeaders() const;
+    const RawHeadersList &allRawHeaders() const;
     QList<QByteArray> rawHeadersKeys() const;
+    QByteArray rawHeader(QAnyStringView headerName) const;
     void setRawHeader(const QByteArray &key, const QByteArray &value);
-    void setAllRawHeaders(const RawHeadersList &list);
     void setCookedHeader(QNetworkRequest::KnownHeaders header, const QVariant &value);
 
-    static QDateTime fromHttpDate(const QByteArray &value);
+    QHttpHeaders headers() const;
+    void setHeaders(const QHttpHeaders &newHeaders);
+    void setHeaders(QHttpHeaders &&newHeaders);
+    void setHeader(QHttpHeaders::WellKnownHeader name, QByteArrayView value);
+
+    void clearHeaders();
+
+    static QDateTime fromHttpDate(QByteArrayView value);
     static QByteArray toHttpDate(const QDateTime &dt);
 
+    static std::optional<qint64> toInt(QByteArrayView value);
+
+    typedef QList<QNetworkCookie> NetworkCookieList;
+    static QByteArray fromCookieList(const NetworkCookieList &cookies);
+    static std::optional<NetworkCookieList> toSetCookieList(const QList<QByteArray> &values);
+    static std::optional<NetworkCookieList> toCookieList(const QList<QByteArray> &values);
+
+    static RawHeadersList fromHttpToRaw(const QHttpHeaders &headers);
+    static QHttpHeaders fromRawToHttp(const RawHeadersList &raw);
+
 private:
-    void setRawHeaderInternal(const QByteArray &key, const QByteArray &value);
-    void parseAndSetHeader(const QByteArray &key, const QByteArray &value);
+    void invalidateHeaderCache();
+
+    void setCookedFromHttp(const QHttpHeaders &newHeaders);
+    void parseAndSetHeader(QByteArrayView key, QByteArrayView value);
+    void parseAndSetHeader(QNetworkRequest::KnownHeaders key, QByteArrayView value);
+
 };
 
 Q_DECLARE_TYPEINFO(QNetworkHeadersPrivate::RawHeaderPair, Q_RELOCATABLE_TYPE);