Switch additional response header to QMultiMap

For consistency with other response headers, even if it is going
to be inconsistent with existing request headers.

Change-Id: I9e9c36ac20982d9c833486171fa9944c9059f471
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

6 files changed, 9 insertions, 9 deletions

diff --git a/src/core/api/qwebengineurlrequestjob.cpp b/src/core/api/qwebengineurlrequestjob.cpp
index 099efef8e..6e978ef28 100644
--- a/src/core/api/qwebengineurlrequestjob.cpp
+++ b/src/core/api/qwebengineurlrequestjob.cpp
@@ -118,7 +118,7 @@ QMap<QByteArray, QByteArray> QWebEngineUrlRequestJob::requestHeaders() const
     is called.
 */
 void QWebEngineUrlRequestJob::setAdditionalResponseHeaders(
-        const QMap<QByteArray, QByteArray> &additionalResponseHeaders) const
+        const QMultiMap<QByteArray, QByteArray> &additionalResponseHeaders) const
 {
     d_ptr->setAdditionalResponseHeaders(additionalResponseHeaders);
 }
diff --git a/src/core/api/qwebengineurlrequestjob.h b/src/core/api/qwebengineurlrequestjob.h
index 75e065566..aa1bf893a 100644
--- a/src/core/api/qwebengineurlrequestjob.h
+++ b/src/core/api/qwebengineurlrequestjob.h
@@ -44,7 +44,7 @@ public:
     void fail(Error error);
     void redirect(const QUrl &url);
     void setAdditionalResponseHeaders(
-            const QMap<QByteArray, QByteArray> &additionalResponseHeaders) const;
+            const QMultiMap<QByteArray, QByteArray> &additionalResponseHeaders) const;
 
 private:
     QWebEngineUrlRequestJob(QtWebEngineCore::URLRequestCustomJobDelegate *);
diff --git a/src/core/net/url_request_custom_job_delegate.cpp b/src/core/net/url_request_custom_job_delegate.cpp
index 07a1de1ec..6319fb160 100644
--- a/src/core/net/url_request_custom_job_delegate.cpp
+++ b/src/core/net/url_request_custom_job_delegate.cpp
@@ -52,7 +52,7 @@ QMap<QByteArray, QByteArray> URLRequestCustomJobDelegate::requestHeaders() const
 }
 
 void URLRequestCustomJobDelegate::setAdditionalResponseHeaders(
-        const QMap<QByteArray, QByteArray> &additionalResponseHeaders)
+        const QMultiMap<QByteArray, QByteArray> &additionalResponseHeaders)
 {
     m_additionalResponseHeaders = additionalResponseHeaders;
 }
diff --git a/src/core/net/url_request_custom_job_delegate.h b/src/core/net/url_request_custom_job_delegate.h
index 6b6ee68cf..6b860bea8 100644
--- a/src/core/net/url_request_custom_job_delegate.h
+++ b/src/core/net/url_request_custom_job_delegate.h
@@ -49,7 +49,7 @@ public:
     QMap<QByteArray, QByteArray> requestHeaders() const;
 
     void
-    setAdditionalResponseHeaders(const QMap<QByteArray, QByteArray> &additionalResponseHeaders);
+    setAdditionalResponseHeaders(const QMultiMap<QByteArray, QByteArray> &additionalResponseHeaders);
     void reply(const QByteArray &contentType, QIODevice *device);
     void redirect(const QUrl &url);
     void abort();
@@ -71,7 +71,7 @@ private:
     QByteArray m_method;
     QUrl m_initiatorOrigin;
     const QMap<QByteArray, QByteArray> m_requestHeaders;
-    QMap<QByteArray, QByteArray> m_additionalResponseHeaders;
+    QMultiMap<QByteArray, QByteArray> m_additionalResponseHeaders;
 };
 
 } // namespace
diff --git a/src/core/net/url_request_custom_job_proxy.cpp b/src/core/net/url_request_custom_job_proxy.cpp
index d548055b5..31c024a52 100644
--- a/src/core/net/url_request_custom_job_proxy.cpp
+++ b/src/core/net/url_request_custom_job_proxy.cpp
@@ -41,7 +41,7 @@ void URLRequestCustomJobProxy::release()
 }
 
 void URLRequestCustomJobProxy::reply(std::string contentType, QIODevice *device,
-                                     QMap<QByteArray, QByteArray> additionalResponseHeaders)
+                                     QMultiMap<QByteArray, QByteArray> additionalResponseHeaders)
 {
     if (!m_client)
         return;
@@ -59,7 +59,7 @@ void URLRequestCustomJobProxy::reply(std::string contentType, QIODevice *device,
     }
     m_client->m_mimeType = qcontentType.trimmed().toStdString();
     m_client->m_device = device;
-    m_client->m_additionalResponseHeaders = additionalResponseHeaders;
+    m_client->m_additionalResponseHeaders = std::move(additionalResponseHeaders);
     if (m_client->m_device && !m_client->m_device->isReadable())
         m_client->m_device->open(QIODevice::ReadOnly);
 
diff --git a/src/core/net/url_request_custom_job_proxy.h b/src/core/net/url_request_custom_job_proxy.h
index 1f8c77da2..b02214f23 100644
--- a/src/core/net/url_request_custom_job_proxy.h
+++ b/src/core/net/url_request_custom_job_proxy.h
@@ -31,7 +31,7 @@ public:
     public:
         std::string m_mimeType;
         std::string m_charset;
-        QMap<QByteArray, QByteArray> m_additionalResponseHeaders;
+        QMultiMap<QByteArray, QByteArray> m_additionalResponseHeaders;
         GURL m_redirect;
         QIODevice *m_device;
         int64_t m_firstBytePosition;
@@ -53,7 +53,7 @@ public:
     // Called from URLRequestCustomJobDelegate via post:
     //void setReplyCharset(const std::string &);
     void reply(std::string mimeType, QIODevice *device,
-               QMap<QByteArray, QByteArray> additionalResponseHeaders);
+               QMultiMap<QByteArray, QByteArray> additionalResponseHeaders);
     void redirect(GURL url);
     void abort();
     void fail(int error);