diff options
| -rw-r--r-- | chrome_frame/http_negotiate.cc | 18 | ||||
| -rw-r--r-- | chrome_frame/urlmon_moniker.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/urlmon_moniker.h | 2 | ||||
| -rw-r--r-- | chrome_frame/urlmon_url_request.cc | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/chrome_frame/http_negotiate.cc b/chrome_frame/http_negotiate.cc index cc9606e..a95255a 100644 --- a/chrome_frame/http_negotiate.cc +++ b/chrome_frame/http_negotiate.cc @@ -258,6 +258,14 @@ HRESULT HttpNegotiatePatch::BeginningTransaction( user_agent_value = original_it.values(); } + // Use the default one if none was provided. + if (user_agent_value.empty()) + user_agent_value = http_utils::GetDefaultUserAgent(); + + // Now add chromeframe to it. + user_agent_value = http_utils::AddChromeFrameToUserAgentValue( + user_agent_value); + // Build new headers, skip the existing user agent value from // existing headers. std::string new_headers; @@ -269,17 +277,11 @@ HRESULT HttpNegotiatePatch::BeginningTransaction( } } - if (!user_agent_value.empty()) { - // Now add chromeframe to the user agent. - user_agent_value = http_utils::AddChromeFrameToUserAgentValue( - user_agent_value); - new_headers += "User-Agent: " + user_agent_value; - new_headers += "\r\n\r\n"; - } + new_headers += "User-Agent: " + user_agent_value; + new_headers += "\r\n\r\n"; if (*additional_headers) ::CoTaskMemFree(*additional_headers); - *additional_headers = reinterpret_cast<wchar_t*>(::CoTaskMemAlloc( (new_headers.length() + 1) * sizeof(wchar_t))); lstrcpyW(*additional_headers, ASCIIToWide(new_headers).c_str()); diff --git a/chrome_frame/urlmon_moniker.cc b/chrome_frame/urlmon_moniker.cc index 5b580b7..4713da0 100644 --- a/chrome_frame/urlmon_moniker.cc +++ b/chrome_frame/urlmon_moniker.cc @@ -141,7 +141,7 @@ bool ShouldWrapCallback(IMoniker* moniker, REFIID iid, IBindCtx* bind_context) { NavigationManager* mgr = NavigationManager::GetThreadInstance(); if (!mgr) { DLOG(INFO) << __FUNCTION__ << " Url: " << url << - " No navigation manager to wrap"; + " No navitagion manager to wrap"; return false; } diff --git a/chrome_frame/urlmon_moniker.h b/chrome_frame/urlmon_moniker.h index 402c386..1f168a8 100644 --- a/chrome_frame/urlmon_moniker.h +++ b/chrome_frame/urlmon_moniker.h @@ -166,4 +166,6 @@ class MonikerPatch { }; +extern wchar_t* kChromeRequestParam; + #endif // CHROME_FRAME_URLMON_MONIKER_H_ diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index 793cb11..3c38b0c 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/chrome_frame/urlmon_url_request.cc @@ -483,10 +483,6 @@ STDMETHODIMP UrlmonUrlRequest::BeginningTransaction(const wchar_t* url, new_headers += StringPrintf("Referer: %s\r\n", referrer().c_str()); } - // Remember to add the user agent header. - new_headers += http_utils::GetDefaultUserAgentHeaderWithCFTag(); - new_headers += "\r\n"; - if (!new_headers.empty()) { *additional_headers = reinterpret_cast<wchar_t*>( CoTaskMemAlloc((new_headers.size() + 1) * sizeof(wchar_t))); |