summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_job.cc
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 05:04:30 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-14 05:04:30 +0000
commit0a12e45004c11896b358ee01f41cee547313d301 (patch)
tree66406b1d881385ba04a09247b75b3b6684e9759b /net/url_request/url_request_job.cc
parent89e4bfb3300a99095aa1d3dfb02c37d1edb8e64c (diff)
downloadchromium_src-0a12e45004c11896b358ee01f41cee547313d301.zip
chromium_src-0a12e45004c11896b358ee01f41cee547313d301.tar.gz
chromium_src-0a12e45004c11896b358ee01f41cee547313d301.tar.bz2
Set blocked_on_delegate_ when a URLRequest is blocked by
its NetworkDelegate during a redirect. R=eroman@chromium.org BUG=159197 Review URL: https://chromiumcodereview.appspot.com/11364057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_job.cc')
-rw-r--r--net/url_request/url_request_job.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 66fc9f3..ba003838 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -191,6 +191,8 @@ void URLRequestJob::FollowDeferredRedirect() {
// It is also possible that FollowRedirect will drop the last reference to
// this job, so we need to reset our members before calling it.
+ SetUnblockedOnDelegate();
+
GURL redirect_url = deferred_redirect_url_;
int redirect_status_code = deferred_redirect_status_code_;
@@ -307,6 +309,7 @@ void URLRequestJob::NotifyHeadersComplete() {
if (defer_redirect) {
deferred_redirect_url_ = new_location;
deferred_redirect_status_code_ = http_status_code;
+ SetBlockedOnDelegate();
} else {
FollowRedirect(new_location, http_status_code);
}