1 files changed, 63 insertions, 7 deletions

diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp
index e330a16d9..152cf4dd0 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -5,9 +5,17 @@
 #include "qwebengineurlrequestinfo_p.h"
 
 #include "web_contents_adapter_client.h"
+#include "net/resource_request_body_qt.h"
+
+#include <memory>
+#include <utility>
 
 QT_BEGIN_NAMESPACE
 
+// We changed the type from QScopedPointer to unique_ptr, make sure it's binary compatible:
+static_assert(sizeof(QScopedPointer<QWebEngineUrlRequestInfoPrivate>)
+              == sizeof(std::unique_ptr<QWebEngineUrlRequestInfoPrivate>));
+
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::LinkNavigation, QWebEngineUrlRequestInfo::NavigationTypeLink)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::TypedNavigation, QWebEngineUrlRequestInfo::NavigationTypeTyped)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::FormSubmittedNavigation,
@@ -69,10 +77,11 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::RedirectNavigation
     execution of this function is finished.
 */
 
-QWebEngineUrlRequestInfoPrivate::QWebEngineUrlRequestInfoPrivate(QWebEngineUrlRequestInfo::ResourceType resource,
-                                                                 QWebEngineUrlRequestInfo::NavigationType navigation,
-                                                                 const QUrl &u, const QUrl &fpu, const QUrl &i,
-                                                                 const QByteArray &m)
+QWebEngineUrlRequestInfoPrivate::QWebEngineUrlRequestInfoPrivate(
+        QWebEngineUrlRequestInfo::ResourceType resource,
+        QWebEngineUrlRequestInfo::NavigationType navigation, const QUrl &u, const QUrl &fpu,
+        const QUrl &i, const QByteArray &m, QtWebEngineCore::ResourceRequestBody *const rb,
+        const QHash<QByteArray, QByteArray> &h)
     : resourceType(resource)
     , navigationType(navigation)
     , shouldBlockRequest(false)
@@ -82,6 +91,8 @@ QWebEngineUrlRequestInfoPrivate::QWebEngineUrlRequestInfoPrivate(QWebEngineUrlRe
     , initiator(i)
     , method(m)
     , changed(false)
+    , extraHeaders(h)
+    , resourceRequestBody(rb)
 {}
 
 /*!
@@ -92,14 +103,17 @@ QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo() {}
 /*!
     \internal
 */
-QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfo &&p) : d_ptr(p.d_ptr.take()) {}
+QWebEngineUrlRequestInfo::QWebEngineUrlRequestInfo(QWebEngineUrlRequestInfo &&p)
+    : d_ptr(std::move(p.d_ptr))
+{
+}
 
 /*!
     \internal
 */
 QWebEngineUrlRequestInfo &QWebEngineUrlRequestInfo::operator=(QWebEngineUrlRequestInfo &&p)
 {
-    d_ptr.reset(p.d_ptr.take());
+    d_ptr = std::move(p.d_ptr);
     return *this;
 }
 
@@ -229,6 +243,20 @@ QByteArray QWebEngineUrlRequestInfo::requestMethod() const
 }
 
 /*!
+    Returns a pointer to a QIODevice that gives access to the request body.
+    The request body can contain data for example when the request is
+    a POST request. If the request body is empty the QIODevice reflects this
+    and does not return any data when performing read operations on it.
+
+    \since 6.7
+*/
+
+QIODevice *QWebEngineUrlRequestInfo::requestBody() const
+{
+    return d_ptr->resourceRequestBody;
+}
+
+/*!
     \internal
 */
 bool QWebEngineUrlRequestInfo::changed() const
@@ -274,8 +302,36 @@ void QWebEngineUrlRequestInfo::block(bool shouldBlock)
 
 void QWebEngineUrlRequestInfo::setHttpHeader(const QByteArray &name, const QByteArray &value)
 {
-    d_ptr->changed = true;
+    // Headers are case insentive, so we need to compare manually
+    for (auto it = d_ptr->extraHeaders.begin(); it != d_ptr->extraHeaders.end(); ++it) {
+        if (it.key().compare(name, Qt::CaseInsensitive) == 0) {
+            d_ptr->extraHeaders.erase(it);
+            break;
+        }
+    }
+
     d_ptr->extraHeaders.insert(name, value);
 }
 
+/*!
+    Returns the request headers.
+    \since 6.5
+    \note Not all headers are visible at this stage as Chromium will add
+    security and proxy headers at a later stage.
+*/
+
+QHash<QByteArray, QByteArray> QWebEngineUrlRequestInfo::httpHeaders() const
+{
+    return d_ptr->extraHeaders;
+}
+
+/*!
+    \internal
+*/
+void QWebEngineUrlRequestInfoPrivate::appendFileToResourceRequestBodyForTest(const QString &path)
+{
+    if (resourceRequestBody)
+        resourceRequestBody->appendFilesForTest(path);
+}
+
 QT_END_NAMESPACE