summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-10-14 13:44:35 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-10-14 13:32:17 +0000
commitc88d2026cc604c9cc7b42e4684eb480f12690e30 (patch)
tree7e476789e99bd0497dba392df0c341a419eb787c
parentb41d57627c005a1b2f093b944787c5dde16b235b (diff)
downloadqtwebengine-chromium-c88d2026cc604c9cc7b42e4684eb480f12690e30.tar.gz
[Backport] CVE-2019-13697
[M77] [resource-timing] Report performance entries with failing status codes Currently we don't report performance entries with failing status codes. From the spec's perspective, reporting aborts is a MAY, but failing status code responses should not be considered aborts. [1] Chromium is the only engine which doesn't report those entries. This CL fixes that to report them similarly to successful status codes. Bug: 883400, 990849 Change-Id: Ic5e99e3df77f3869aa0dd70f0141d88016fdb972 [1] https://github.com/w3c/resource-timing/issues/165#issuecomment-441413636 (cherry picked from commit 5e556dd80e03b7a217e10990d71be25d07e1ece7) Change-Id: Ic5e99e3df77f3869aa0dd70f0141d88016fdb972 Commit-Queue: Yoav Weiss <yoavweiss@chromium.org> Reviewed-by: Yutaka Hirano <yhirano@chromium.org> Reviewed-by: Mike West <mkwst@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#695596} Reviewed-by: Dale Curtis <dalecurtis@chromium.org> Cr-Commit-Position: refs/branch-heads/3865@{#857} Cr-Branched-From: 0cdcc6158160790658d1f033d3db873603250124-refs/heads/master@{#681094} Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
index a8a972f4656..7761a73f517 100644
--- a/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
+++ b/chromium/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
@@ -1701,8 +1701,7 @@ void ResourceFetcher::HandleLoaderFinish(
if (scoped_refptr<ResourceTimingInfo> info =
resource_timing_info_map_.Take(resource)) {
- if (resource->GetResponse().IsHTTP() &&
- resource->GetResponse().HttpStatusCode() < 400) {
+ if (resource->GetResponse().IsHTTP()) {
info->SetInitialURL(resource->GetResourceRequest()
.GetInitialUrlForResourceTiming()
.IsNull()