summaryrefslogtreecommitdiffstats
path: root/chrome_frame/urlmon_url_request.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-12 23:15:20 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-12 23:15:20 +0000
commite20e2515801e20581f0f64cf17f643ac4b1b8fc0 (patch)
treee0b1a25d91dc73fcfc0f1f38c21faf7b8af2eb42 /chrome_frame/urlmon_url_request.cc
parentb855ebe60df2d7429b88490a8d33a3757515a692 (diff)
downloadchromium_src-e20e2515801e20581f0f64cf17f643ac4b1b8fc0.zip
chromium_src-e20e2515801e20581f0f64cf17f643ac4b1b8fc0.tar.gz
chromium_src-e20e2515801e20581f0f64cf17f643ac4b1b8fc0.tar.bz2
In ChromeFrame's bind status callback functions we should always return success regardless of whether we have
a valid delegate or not. Bug=43927 Review URL: http://codereview.chromium.org/2030009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_url_request.cc')
-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 68296a1..17d2825 100644
--- a/chrome_frame/urlmon_url_request.cc
+++ b/chrome_frame/urlmon_url_request.cc
@@ -285,6 +285,11 @@ STDMETHODIMP UrlmonUrlRequest::OnProgress(ULONG progress, ULONG max_progress,
if (pending_ && status_code != BINDSTATUS_REDIRECTING)
return S_OK;
+ if (!delegate_) {
+ DLOG(INFO) << "Invalid delegate";
+ return S_OK;
+ }
+
switch (status_code) {
case BINDSTATUS_REDIRECTING: {
// If we receive a redirect for the initial pending request initiated
@@ -595,7 +600,7 @@ STDMETHODIMP UrlmonUrlRequest::OnResponse(DWORD dwResponseCode,
if (!delegate_) {
DLOG(WARNING) << "Invalid delegate";
- return E_FAIL;
+ return S_OK;
}
std::string raw_headers = WideToUTF8(response_headers);