summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 16:04:35 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 16:04:35 +0000
commit95c99dc6cc270b190616410fec72642ecc6e1aef (patch)
treeb7fb53824ce98ee509eee9838c34d405aeadb19c /net
parent89b5086478b13ca0819281652f6ecae53036f760 (diff)
downloadchromium_src-95c99dc6cc270b190616410fec72642ecc6e1aef.zip
chromium_src-95c99dc6cc270b190616410fec72642ecc6e1aef.tar.gz
chromium_src-95c99dc6cc270b190616410fec72642ecc6e1aef.tar.bz2
Handle conflict resolution for webRequest API
This CL enables conflict resolution for the webRequest API. - If any extension tries to cancel a request, this request is honored. - If two extensions try to redirect the request, the one installed last wins, the other ones are ignored and reported (to stderr at the moment) - If two extensions try to modify the *same* request header, the extension installed last wins, all header modifications of the other extension are ignored and the extension is reported (to stderr at the moment) BUG=60101 TEST=no Review URL: http://codereview.chromium.org/7499002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/url_request/url_request.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index fd220c5..fe936a44 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -797,6 +797,7 @@ void URLRequest::NotifyRequestCompleted() {
if (has_notified_completion_)
return;
+ is_pending_ = false;
has_notified_completion_ = true;
if (context_ && context_->network_delegate())
context_->network_delegate()->NotifyCompleted(this);