diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/update_client/net | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/update_client/net')
| -rw-r--r-- | chromium/components/update_client/net/network_impl.cc | 5 | ||||
| -rw-r--r-- | chromium/components/update_client/net/network_impl.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/chromium/components/update_client/net/network_impl.cc b/chromium/components/update_client/net/network_impl.cc index d2a99abddd9..12661a7f569 100644 --- a/chromium/components/update_client/net/network_impl.cc +++ b/chromium/components/update_client/net/network_impl.cc @@ -102,6 +102,7 @@ NetworkFetcherImpl::~NetworkFetcherImpl() = default; void NetworkFetcherImpl::PostRequest( const GURL& url, const std::string& post_data, + const std::string& content_type, const base::flat_map<std::string, std::string>& post_additional_headers, ResponseStartedCallback response_started_callback, ProgressCallback progress_callback, @@ -119,7 +120,9 @@ void NetworkFetcherImpl::PostRequest( simple_url_loader_->SetRetryOptions( kMaxRetriesOnNetworkChange, network::SimpleURLLoader::RETRY_ON_NETWORK_CHANGE); - simple_url_loader_->AttachStringForUpload(post_data, "application/json"); + // The `Content-Type` header set by |AttachStringForUpload| overwrites any + // `Content-Type` header present in the |ResourceRequest| above. + simple_url_loader_->AttachStringForUpload(post_data, content_type); simple_url_loader_->SetOnResponseStartedCallback(base::BindOnce( &NetworkFetcherImpl::OnResponseStartedCallback, base::Unretained(this), std::move(response_started_callback))); diff --git a/chromium/components/update_client/net/network_impl.h b/chromium/components/update_client/net/network_impl.h index 71d1c7bd181..f8d4f9c4e8f 100644 --- a/chromium/components/update_client/net/network_impl.h +++ b/chromium/components/update_client/net/network_impl.h @@ -34,6 +34,7 @@ class NetworkFetcherImpl : public NetworkFetcher { void PostRequest( const GURL& url, const std::string& post_data, + const std::string& content_type, const base::flat_map<std::string, std::string>& post_additional_headers, ResponseStartedCallback response_started_callback, ProgressCallback progress_callback, |