summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2019-04-01 10:28:52 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-01 18:13:06 +0000
commite952fe76ff23e0d929fa933e434a9245a0516fd6 (patch)
tree19b8023e68840797bdfd6f62db0933a759a31930
parent1110b9b50e61bf2663e2037ce9e28e74a8943919 (diff)
Update Chromium
Also fixes the fact that WebEngine was passing POST data to Chromium even if the request was not a POST request. This triggered an assert in the backported code. 3aaf2ca833c [Backport] Security bug 906739 e4e10461659 [Backport] Security bug 906437 0a717e1dbe9 [Backport] Security bug 913212 c7fa9a16957 [Backport] CVE-2019-5803 ebe1e7068ca [Backport] Dependency for CVE-2019-5802 (1/5) 597dae52a3b [Backport] CVE-2019-5802 (1/5) 64d3770e5e9 [Backport] CVE-2019-5802 (2/5) a34d2fb5dd1 [Backport] CVE-2019-5802 (3/5) 62f25b2d83f [Backport] CVE-2019-5802 (4/5) a63d51633ab [Backport] Dependency for CVE-2019-5802 (5/5) c6d0023bc59 [Backport] CVE-2019-5802 (5/5) f7fcbe53871 [Backport] Security bug 905509 (1/13) 94f1317917f [Backport] Security bug 905509 (2/13) 812a9e68a2c [Backport] Security bug 905509 (3/13) 36c2c5e8b27 [Backport] Security bug 905509 (4/13) 8b01fa3780a [Backport] Security bug 905509 (5/13) 69b772f1e9a [Backport] Security bug 905509 (6/13) f2dfd87785a [Backport] Security bug 905509 (7/13) ec503eae3ed [Backport] Security bug 905509 (8/13) f5a4144a132 [Backport] Security bug 905509 (9/13) 03d8580cf59 [Backport] Security bug 905509 (10/13) 03c4a4ffb98 [Backport] Security bug 905509 (11/13) 700a4af1fb5 [Backport] Security bug 905509 (12/13) 03be3aa656a [Backport] Security bug 917707 269d53ceabd [Backport] Security bug 905509 (13/13) d720564a5ba [Backport] Security bug 938251 85136fedbde [Backport] Security Bug 929088 037efcfdba3 [Backport] Security Bug 931640 1/2 bea83ccee0f [Backport] Security Bug 931640 2/2 dd18af1614f [Backport] Security Bug 924905 e54c1076009 [Backport] Security Bug 919572 258feedf8e1 [Backport] Security Bug 919340 f4f1e852df5 [Backport] CVE-2019-5789 8566ec6cc21 FIXUP: [Backport] Security bug 905509 (3/13) 3d59c5717de FIXUP: [Backport] Security bug 906739 dd6863f4aea FIXUP: [Backport] Security bug 905509 43c92056fab FIXUP: [Backport] CVE-2019-5802 d6d21a17c5a FIXUP: [Backport] Security bug 913212 a4a129005d8 FIXUP: [Backport] Security bug 905509 38a6ae037ee FIXUP: [Backport] Security Bug 924905 d147ad350da FIXUP: [Backport] Security bug 905509 (3/13) Task-number: QTBUG-74445 Change-Id: Ic8d750bc89950c0e020eb43881dbf03328108940 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
m---------src/3rdparty0
-rw-r--r--src/core/web_contents_adapter.cpp8
2 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject e8bb1f1a6b2877c86519749ffab34f94bb6a102
+Subproject d147ad350da3c5795669abd9794665ea2cd7e5a
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 21540f5da..3e5003960 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -630,13 +630,13 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
"HTTP-POST data can only be sent over HTTP(S) protocol"));
return;
}
+
+ params.post_data = network::ResourceRequestBody::CreateFromBytes(
+ (const char*)request.postData().constData(),
+ request.postData().length());
break;
}
- params.post_data = network::ResourceRequestBody::CreateFromBytes(
- (const char*)request.postData().constData(),
- request.postData().length());
-
// convert the custom headers into the format that chromium expects
QVector<QByteArray> headers = request.headers();
for (QVector<QByteArray>::const_iterator it = headers.cbegin(); it != headers.cend(); ++it) {