summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-22 13:04:12 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-22 13:04:12 +0000
commit451c8e922efb15de32efbe6083f0e8f0bb6cf719 (patch)
tree0449f8edf937cc512a04f6fce3c44ebe11ea78e0 /net
parent808871d24448f1985c7644ba9857bb5a07f81b09 (diff)
downloadchromium_src-451c8e922efb15de32efbe6083f0e8f0bb6cf719.zip
chromium_src-451c8e922efb15de32efbe6083f0e8f0bb6cf719.tar.gz
chromium_src-451c8e922efb15de32efbe6083f0e8f0bb6cf719.tar.bz2
Don't throttle unless origin schema is chrome-extension.
BUG=83775 Review URL: http://codereview.chromium.org/9819001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/url_request/url_request_http_job.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 871f99e..2b8988b 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -320,7 +320,13 @@ void URLRequestHttpJob::StartTransactionInternal() {
rv = request_->context()->http_transaction_factory()->CreateTransaction(
&transaction_);
if (rv == OK) {
+ // TODO(joi): The hard-coded check for "chrome-extension" is
+ // temporary (as of 2012/3/21), intended only to make sure this
+ // change (to throttle only requests originating from
+ // extensions) gets into M19. Right after the M19 branch point,
+ // I will sort this out in a more architecturally-sound way.
if (!URLRequestThrottlerManager::GetInstance()->enforce_throttling() ||
+ request_->first_party_for_cookies().scheme() != "chrome-extension" ||
!throttling_entry_->ShouldRejectRequest(request_info_.load_flags)) {
rv = transaction_->Start(
&request_info_, start_callback_, request_->net_log());