diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-12 23:53:14 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-12 23:53:14 +0000 |
| commit | 596ee3657b7aab475f3a2e953a9f8b38c5deb08e (patch) | |
| tree | 1baf97e0e57931f8ed9e231289816785f7fe0459 | |
| parent | afdc4c11bd73b73b0d03c6bf1e192d33d1af61f2 (diff) | |
| download | chromium_src-596ee3657b7aab475f3a2e953a9f8b38c5deb08e.zip chromium_src-596ee3657b7aab475f3a2e953a9f8b38c5deb08e.tar.gz chromium_src-596ee3657b7aab475f3a2e953a9f8b38c5deb08e.tar.bz2 | |
Merge 47088 - 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
TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/2014015
git-svn-id: svn://svn.chromium.org/chrome/branches/375/src@47096 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/urlmon_url_request.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc index b95e4fe..769302b 100644 --- a/chrome_frame/urlmon_url_request.cc +++ b/chrome_frame/urlmon_url_request.cc @@ -214,6 +214,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 @@ -542,7 +547,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); |