Compare commits
No commits in common. "8283317cb1b1289bbe362bb33b7ceaea631227ff" and "311eaf827e7b7fd3d5a43de4a716763056a1a19e" have entirely different histories.
8283317cb1
...
311eaf827e
|
@ -358,7 +358,6 @@ class InterceptedRequest : public network::mojom::URLLoader,
|
||||||
GURL redirect_url_;
|
GURL redirect_url_;
|
||||||
GURL header_client_redirect_url_;
|
GURL header_client_redirect_url_;
|
||||||
const net::MutableNetworkTrafficAnnotationTag traffic_annotation_;
|
const net::MutableNetworkTrafficAnnotationTag traffic_annotation_;
|
||||||
std::optional<network::mojom::CredentialsMode> original_crendentials_mode_;
|
|
||||||
|
|
||||||
mojo::Receiver<network::mojom::URLLoader> proxied_loader_receiver_;
|
mojo::Receiver<network::mojom::URLLoader> proxied_loader_receiver_;
|
||||||
mojo::Remote<network::mojom::URLLoaderClient> target_client_;
|
mojo::Remote<network::mojom::URLLoaderClient> target_client_;
|
||||||
|
@ -507,7 +506,6 @@ void InterceptedRequest::Restart() {
|
||||||
// Match logic in CorsURLLoader::StartNetworkRequest.
|
// Match logic in CorsURLLoader::StartNetworkRequest.
|
||||||
const auto response_tainting = CalculateResponseTainting(
|
const auto response_tainting = CalculateResponseTainting(
|
||||||
should_check_cors, request_.mode, tainted_origin);
|
should_check_cors, request_.mode, tainted_origin);
|
||||||
original_crendentials_mode_ = request_.credentials_mode;
|
|
||||||
request_.credentials_mode =
|
request_.credentials_mode =
|
||||||
network::cors::CalculateCredentialsFlag(request_.credentials_mode,
|
network::cors::CalculateCredentialsFlag(request_.credentials_mode,
|
||||||
response_tainting)
|
response_tainting)
|
||||||
|
@ -876,14 +874,6 @@ void InterceptedRequest::ContinueAfterIntercept() {
|
||||||
target_loader_.BindNewPipeAndPassReceiver(), id_, options, request_,
|
target_loader_.BindNewPipeAndPassReceiver(), id_, options, request_,
|
||||||
proxied_client_receiver_.BindNewPipeAndPassRemote(),
|
proxied_client_receiver_.BindNewPipeAndPassRemote(),
|
||||||
traffic_annotation_);
|
traffic_annotation_);
|
||||||
if (original_crendentials_mode_) {
|
|
||||||
// Restore the original |credentials_mode| value after calling
|
|
||||||
// CreateLoaderAndStart. This matches the logic in CorsURLLoader::
|
|
||||||
// StartNetworkRequest and allows InterceptedRequest::Restart to compute
|
|
||||||
// the correct |credentials_mode| during a fetch request redirect.
|
|
||||||
request_.credentials_mode = *original_crendentials_mode_;
|
|
||||||
original_crendentials_mode_.reset();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -795,12 +795,5 @@ patches = [
|
||||||
# Reverts
|
# Reverts
|
||||||
# https://chromium-review.googlesource.com/c/chromium/src/+/5454331
|
# https://chromium-review.googlesource.com/c/chromium/src/+/5454331
|
||||||
'name': 'win_partition_freelist_entry_336007395'
|
'name': 'win_partition_freelist_entry_336007395'
|
||||||
},
|
|
||||||
{
|
|
||||||
# Revert unretained dangling ptr detector crash by default.
|
|
||||||
# https://github.com/chromiumembedded/cef/issues/3693
|
|
||||||
# Reverts
|
|
||||||
# https://chromium-review.googlesource.com/c/chromium/src/+/5351597
|
|
||||||
'name': 'base_allocator_unretained_dangling_ptr_5351597'
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git base/allocator/partition_alloc_features.cc base/allocator/partition_alloc_features.cc
|
|
||||||
index a2616fced0f5b..cacd41b0ffa23 100644
|
|
||||||
--- base/allocator/partition_alloc_features.cc
|
|
||||||
+++ base/allocator/partition_alloc_features.cc
|
|
||||||
@@ -36,7 +36,7 @@ const base::FeatureParam<UnretainedDanglingPtrMode>
|
|
||||||
kUnretainedDanglingPtrModeParam = {
|
|
||||||
&kPartitionAllocUnretainedDanglingPtr,
|
|
||||||
"mode",
|
|
||||||
- UnretainedDanglingPtrMode::kCrash,
|
|
||||||
+ UnretainedDanglingPtrMode::kDumpWithoutCrashing,
|
|
||||||
&kUnretainedDanglingPtrModeOption,
|
|
||||||
};
|
|
||||||
|
|
Loading…
Reference in New Issue