summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-30 15:35:08 +0000
committerstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-30 15:35:08 +0000
commitb7a3612e580b04b6b0d40291565cd834dc16242e (patch)
tree8e0ce5e6651d50375ab51335d677d62cba8332dc /chrome_frame
parentb9c505bc4409b403aab2c67f016fbe4b01ad1509 (diff)
downloadchromium_src-b7a3612e580b04b6b0d40291565cd834dc16242e.zip
chromium_src-b7a3612e580b04b6b0d40291565cd834dc16242e.tar.gz
chromium_src-b7a3612e580b04b6b0d40291565cd834dc16242e.tar.bz2
Ignore EndRequest() for a urlmon urlrequest from Chrome, if terminate_bind (i.e. DownloadInHost) request is already received.
BUG=42104 Review URL: http://codereview.chromium.org/1705018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/urlmon_url_request.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc
index fb937bf..961b7da 100644
--- a/chrome_frame/urlmon_url_request.cc
+++ b/chrome_frame/urlmon_url_request.cc
@@ -57,6 +57,11 @@ void UrlmonUrlRequest::Stop() {
DCHECK((status_.get_state() != Status::DONE) == (binding_ != NULL));
Status::State state = status_.get_state();
delegate_ = NULL;
+
+ // If DownloadInHost is already requested, we will quit soon anyway.
+ if (terminate_requested())
+ return;
+
switch (state) {
case Status::WORKING:
status_.Cancel();