summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2019-12-04 17:46:43 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2019-12-05 13:25:12 +0000
commitdc7abb552a0a11be2e6b78c0229742a70e35330f (patch)
tree9c7cdd88004e6e01ba2466106a11761243f2c745
parentd62c0b33564162e62506adfe519700a11e7d5628 (diff)
downloadqtwebengine-chromium-dc7abb552a0a11be2e6b78c0229742a70e35330f.tar.gz
[Backport] CVE-2019-13697
Manual backport. [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 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> Change-Id: I5251942aa8061c3e93a4ae5a664fa81034df5395
-rw-r--r--chromium/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/chromium/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 1cc43eebaa8..54e168ffb44 100644
--- a/chromium/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/chromium/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -1152,8 +1152,7 @@ void ResourceFetcher::didFinishLoading(Resource* resource,
info->addRedirect(responses[i], crossOrigin);
}
- if (resource->response().isHTTP() &&
- resource->response().httpStatusCode() < 400) {
+ if (resource->response().isHTTP()) {
populateResourceTiming(info.get(), resource);
info->setLoadFinishTime(finishTime);
// encodedDataLength == -1 means "not available".