Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(585)

Unified Diff: net/url_request/url_request_http_job.cc

Issue 6065008: Do not override User-Agent header added by WebCore (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/url_request/url_request_http_job.cc
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index ec0134a5ac11f58a2425764527dba92e981c6fe0..601f487a9aaaacb04abd922c2f491fef999f0af2 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -194,7 +194,7 @@ void URLRequestHttpJob::Start() {
request_info_.priority = request_->priority();
if (request_->context()) {
- request_info_.extra_headers.SetHeader(
+ request_info_.extra_headers.SetHeaderIfMissing(
HttpRequestHeaders::kUserAgent,
request_->context()->GetUserAgent(request_->url()));
}
@@ -780,18 +780,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
if (context) {
// Only add default Accept-Language and Accept-Charset if the request
// didn't have them specified.
- if (!request_info_.extra_headers.HasHeader(
- HttpRequestHeaders::kAcceptLanguage)) {
- request_info_.extra_headers.SetHeader(
- HttpRequestHeaders::kAcceptLanguage,
- context->accept_language());
- }
- if (!request_info_.extra_headers.HasHeader(
- HttpRequestHeaders::kAcceptCharset)) {
- request_info_.extra_headers.SetHeader(
- HttpRequestHeaders::kAcceptCharset,
- context->accept_charset());
- }
+ request_info_.extra_headers.SetHeaderIfMissing(
+ HttpRequestHeaders::kAcceptLanguage,
+ context->accept_language());
+ request_info_.extra_headers.SetHeaderIfMissing(
+ HttpRequestHeaders::kAcceptCharset,
+ context->accept_charset());
}
}

Powered by Google App Engine
This is Rietveld 408576698