summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-16 23:28:33 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-16 23:28:33 +0000
commit06a15295b0ace16320526ed1a59d5f25ee9e2119 (patch)
tree9bd8c6cc9d77cd14e25e03e39aa4669e9f7b5e7b /chrome_frame
parent07537bff7d75b6315b295ff84842f5a4bd95e2c8 (diff)
downloadchromium_src-06a15295b0ace16320526ed1a59d5f25ee9e2119.zip
chromium_src-06a15295b0ace16320526ed1a59d5f25ee9e2119.tar.gz
chromium_src-06a15295b0ace16320526ed1a59d5f25ee9e2119.tar.bz2
Pass HTTP headers to Chrome in the initial pending request initiated by ChromeFrame. This causes pages with encoding needs
to render incorrectly. Fixes bug http://code.google.com/p/chromium/issues/detail?id=41541 Bug=41541 Review URL: http://codereview.chromium.org/1642015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/urlmon_url_request.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc
index 5c9ba42..3c38b0c 100644
--- a/chrome_frame/urlmon_url_request.cc
+++ b/chrome_frame/urlmon_url_request.cc
@@ -170,6 +170,10 @@ STDMETHODIMP UrlmonUrlRequest::OnStartBinding(DWORD reserved,
IBinding *binding) {
DCHECK_EQ(thread_, PlatformThread::CurrentId());
binding_ = binding;
+ if (pending_) {
+ response_headers_ = GetHttpHeadersFromBinding(binding_);
+ DCHECK(!response_headers_.empty());
+ }
return S_OK;
}
@@ -989,7 +993,8 @@ void UrlmonUrlRequestManager::StartRequest(int request_id,
} else {
// Request is already underway, call OnResponse so that the
// other side can start reading.
- new_request->OnResponse(0, L"", NULL, NULL);
+ new_request->OnResponse(
+ 0, UTF8ToWide(new_request->response_headers()).c_str(), NULL, NULL);
}
}