1 files changed, 16 insertions, 28 deletions

diff --git a/src/network/access/qhttpheaderparser.cpp b/src/network/access/qhttpheaderparser.cpp
index 558f8dbd5c..0b7882c18a 100644
--- a/src/network/access/qhttpheaderparser.cpp
+++ b/src/network/access/qhttpheaderparser.cpp
@@ -52,11 +52,11 @@ bool QHttpHeaderParser::parseHeaders(QByteArrayView header)
     if (header.size() - (header.endsWith("\r\n") ? 2 : 1) > maxTotalSize)
         return false;
 
-    QList<QPair<QByteArray, QByteArray>> result;
+    QHttpHeaders result;
     while (!header.empty()) {
         const qsizetype colon = header.indexOf(':');
         if (colon == -1) // if no colon check if empty headers
-            return result.empty() && (header == "\n" || header == "\r\n");
+            return result.isEmpty() && (header == "\n" || header == "\r\n");
         if (result.size() >= maxFieldCount)
             return false;
         QByteArrayView name = header.first(colon);
@@ -75,14 +75,14 @@ bool QHttpHeaderParser::parseHeaders(QByteArrayView header)
             line = line.trimmed();
             if (!line.empty()) {
                 if (value.size())
-                    value += ' ' + line.toByteArray();
+                    value += ' ' + line;
                 else
                     value = line.toByteArray();
             }
             header = header.sliced(endLine + 1);
         } while (hSpaceStart(header));
         Q_ASSERT(name.size() + 1 + value.size() <= maxFieldSize);
-        result.append(qMakePair(name.toByteArray(), value));
+        result.append(name, value);
     }
 
     fields = result;
@@ -102,7 +102,7 @@ bool QHttpHeaderParser::parseStatus(QByteArrayView status)
     static const int spacePos = 8;
     static const char httpMagic[] = "HTTP/";
 
-    if (status.length() < minLength
+    if (status.size() < minLength
         || !status.startsWith(httpMagic)
         || status.at(dotPos) != '.'
         || status.at(spacePos) != ' ') {
@@ -128,22 +128,18 @@ bool QHttpHeaderParser::parseStatus(QByteArrayView status)
     return ok && uint(majorVersion) <= 9 && uint(minorVersion) <= 9;
 }
 
-const QList<QPair<QByteArray, QByteArray> >& QHttpHeaderParser::headers() const
+const QHttpHeaders& QHttpHeaderParser::headers() const
 {
     return fields;
 }
 
-QByteArray QHttpHeaderParser::firstHeaderField(const QByteArray &name,
+QByteArray QHttpHeaderParser::firstHeaderField(QByteArrayView name,
                                                const QByteArray &defaultValue) const
 {
-    for (auto it = fields.constBegin(); it != fields.constEnd(); ++it) {
-        if (name.compare(it->first, Qt::CaseInsensitive) == 0)
-            return it->second;
-    }
-    return defaultValue;
+    return fields.value(name, defaultValue).toByteArray();
 }
 
-QByteArray QHttpHeaderParser::combinedHeaderValue(const QByteArray &name, const QByteArray &defaultValue) const
+QByteArray QHttpHeaderParser::combinedHeaderValue(QByteArrayView name, const QByteArray &defaultValue) const
 {
     const QList<QByteArray> allValues = headerFieldValues(name);
     if (allValues.isEmpty())
@@ -151,38 +147,30 @@ QByteArray QHttpHeaderParser::combinedHeaderValue(const QByteArray &name, const
     return allValues.join(", ");
 }
 
-QList<QByteArray> QHttpHeaderParser::headerFieldValues(const QByteArray &name) const
+QList<QByteArray> QHttpHeaderParser::headerFieldValues(QByteArrayView name) const
 {
-    QList<QByteArray> result;
-    for (auto it = fields.constBegin(); it != fields.constEnd(); ++it)
-        if (name.compare(it->first, Qt::CaseInsensitive) == 0)
-            result += it->second;
-
-    return result;
+    return fields.values(name);
 }
 
-void QHttpHeaderParser::removeHeaderField(const QByteArray &name)
+void QHttpHeaderParser::removeHeaderField(QByteArrayView name)
 {
-    auto firstEqualsName = [&name](const QPair<QByteArray, QByteArray> &header) {
-        return name.compare(header.first, Qt::CaseInsensitive) == 0;
-    };
-    fields.removeIf(firstEqualsName);
+    fields.removeAll(name);
 }
 
 void QHttpHeaderParser::setHeaderField(const QByteArray &name, const QByteArray &data)
 {
     removeHeaderField(name);
-    fields.append(qMakePair(name, data));
+    fields.append(name, data);
 }
 
 void QHttpHeaderParser::prependHeaderField(const QByteArray &name, const QByteArray &data)
 {
-    fields.prepend(qMakePair(name, data));
+    fields.insert(0, name, data);
 }
 
 void QHttpHeaderParser::appendHeaderField(const QByteArray &name, const QByteArray &data)
 {
-    fields.append(qMakePair(name, data));
+    fields.append(name, data);
 }
 
 void QHttpHeaderParser::clearHeaders()