From 765f1ca098eeb9caaf68f367e5a3fb7351b96575 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Mon, 13 Apr 2020 09:46:15 -0700 Subject: [PATCH 1/2] build: improve patch filename remembering (#23070) --- script/lib/patches.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/lib/patches.py b/script/lib/patches.py index 92533b45dab9d..c5865c2e70b9b 100644 --- a/script/lib/patches.py +++ b/script/lib/patches.py @@ -7,10 +7,12 @@ def read_patch(patch_dir, patch_filename): """Read a patch from |patch_dir/filename| and amend the commit message with metadata about the patch file it came from.""" ret = [] + added_filename_line = False with open(os.path.join(patch_dir, patch_filename)) as f: for l in f.readlines(): - if l.startswith('diff -'): + if not added_filename_line and (l.startswith('diff -') or l.startswith('---')): ret.append('Patch-Filename: {}\n'.format(patch_filename)) + added_filename_line = True ret.append(l) return ''.join(ret) From 8d8b8111ae91a15a3c84d74c3bf9fcb0570f9235 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Mon, 20 Apr 2020 22:40:10 +0000 Subject: [PATCH 2/2] update patches --- .../common/chromium/cherry-pick-adc8f05aa3ab.patch | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/patches/common/chromium/cherry-pick-adc8f05aa3ab.patch b/patches/common/chromium/cherry-pick-adc8f05aa3ab.patch index f27c0f822ffa9..3d73f6207b668 100644 --- a/patches/common/chromium/cherry-pick-adc8f05aa3ab.patch +++ b/patches/common/chromium/cherry-pick-adc8f05aa3ab.patch @@ -1,7 +1,7 @@ -From adc8f05aa3abbde50a7b9171c7311aba08c07b00 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Turner Date: Fri, 20 Sep 2019 20:21:41 +0000 -Subject: [PATCH] Handle ERR_CACHE_RACE in DoDoneHeadersAddToEntryComplete +Subject: Handle ERR_CACHE_RACE in DoDoneHeadersAddToEntryComplete Crashes have been observed in the wild that may be due to ERR_CACHE_RACE being sent to STATE_DONE_HEADERS_ADD_TO_ENTRY_COMPLETE. @@ -16,15 +16,12 @@ Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1814843 Commit-Queue: Alex Turner Reviewed-by: Shivani Sharma Cr-Commit-Position: refs/heads/master@{#698597} ---- - net/http/http_cache_transaction.cc | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc -index 6f2577de617ec..bc1193f4b7d43 100644 +index d3795484f0bac2e6318632617f4e2f41bf1cf772..5fc048709e8001919cd5b5684d39ad4e3c6681fb 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc -@@ -1430,8 +1430,15 @@ int HttpCache::Transaction::DoDoneHeadersAddToEntryComplete(int result) { +@@ -1481,8 +1481,15 @@ int HttpCache::Transaction::DoDoneHeadersAddToEntryComplete(int result) { DCHECK(response_.headers); cache_pending_ = false; @@ -41,7 +38,7 @@ index 6f2577de617ec..bc1193f4b7d43 100644 DCHECK_NE(response_.headers->response_code(), 304); DCHECK(cache_->CanTransactionWriteResponseHeaders( entry_, this, partial_ != nullptr, false)); -@@ -2078,6 +2085,7 @@ int HttpCache::Transaction::DoHeadersPhaseCannotProceed(int result) { +@@ -2113,6 +2120,7 @@ int HttpCache::Transaction::DoHeadersPhaseCannotProceed(int result) { SetRequest(net_log_); entry_ = nullptr;