diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 00:21:19 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 00:21:19 +0000 |
| commit | 7b49c3e130f8abaac1503985a59aade040c75ceb (patch) | |
| tree | b50cf2822c115abc2eff77082aebca47406dfe0c /chrome_frame | |
| parent | f91311849d54367720566391e17802d2437125a5 (diff) | |
| download | chromium_src-7b49c3e130f8abaac1503985a59aade040c75ceb.zip chromium_src-7b49c3e130f8abaac1503985a59aade040c75ceb.tar.gz chromium_src-7b49c3e130f8abaac1503985a59aade040c75ceb.tar.bz2 | |
Fix a regression in ChromeFrame which would cause the headers like the UA to be appended
twice.
Bug=none
Review URL: http://codereview.chromium.org/4249001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/urlmon_url_request.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index c77df46..a72e3a2 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/chrome_frame/urlmon_url_request.cc @@ -591,9 +591,9 @@ STDMETHODIMP UrlmonUrlRequest::BeginningTransaction(const wchar_t* url, // identify chromeframe as the user agent. This also ensures that the user // agent reported in scripts in chrome frame is consistent with that sent // in outgoing requests. - new_headers += ReplaceOrAddUserAgent(current_headers, - http_utils::GetChromeUserAgent()); - new_headers += AppendCFUserAgentString(UTF8ToWide(new_headers).c_str(), NULL); + std::string user_agent = http_utils::AddChromeFrameToUserAgentValue( + http_utils::GetChromeUserAgent()); + new_headers += ReplaceOrAddUserAgent(current_headers, user_agent); if (!new_headers.empty()) { *additional_headers = reinterpret_cast<wchar_t*>( |