diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-23 10:36:26 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 10:42:53 +0200 |
commit | b7a905a4f2f43b856e5f365439fb21b70a03682e (patch) | |
tree | 0712f43bbeec8c03e739110ddfa584943bf6fdac /src/core/net/url_request_notification.cpp | |
parent | e710d15b7243f2fbc99f98c3ca79d325eb459ac7 (diff) | |
parent | e02bcb0855ebee0612cab0f3cd3f9fd494497336 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty
src/core/net/network_delegate_qt.cpp
tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
Change-Id: Ib715b3047213583e0441b915d3cabb801d9d4ba8
Diffstat (limited to 'src/core/net/url_request_notification.cpp')
-rw-r--r-- | src/core/net/url_request_notification.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/net/url_request_notification.cpp b/src/core/net/url_request_notification.cpp index 6da661cff..e37ad35bc 100644 --- a/src/core/net/url_request_notification.cpp +++ b/src/core/net/url_request_notification.cpp @@ -109,7 +109,8 @@ void URLRequestNotification::notify() if (m_profileAdapter) { QWebEngineUrlRequestInterceptor* interceptor = m_profileAdapter->requestInterceptor(); - interceptor->interceptRequest(m_requestInfo); + if (!interceptor->property("deprecated").toBool()) + interceptor->interceptRequest(m_requestInfo); } WebContentsAdapterClient *client = @@ -171,8 +172,14 @@ void URLRequestNotification::complete(int error) if (!m_requestInfo.d_ptr->extraHeaders.isEmpty()) { auto end = m_requestInfo.d_ptr->extraHeaders.constEnd(); - for (auto header = m_requestInfo.d_ptr->extraHeaders.constBegin(); header != end; ++header) - m_request->SetExtraRequestHeaderByName(header.key().toStdString(), header.value().toStdString(), /* overwrite */ true); + for (auto header = m_requestInfo.d_ptr->extraHeaders.constBegin(); header != end; ++header) { + std::string h = header.key().toStdString(); + if (base::LowerCaseEqualsASCII(h, "referer")) { + m_request->SetReferrer(header.value().toStdString()); + } else { + m_request->SetExtraRequestHeaderByName(h, header.value().toStdString(), /* overwrite */ true); + } + } } } |