summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-05 05:02:48 +0000
committermal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-05 05:02:48 +0000
commit01f1a4e67343b94b06e1a7efe3f3739596397e7b (patch)
tree1f5f11ef8e184eec4939e52851068c2d2866866f /net
parent6e92d38eecb2b931c32414d4d61fd5b0097bf485 (diff)
downloadchromium_src-01f1a4e67343b94b06e1a7efe3f3739596397e7b.zip
chromium_src-01f1a4e67343b94b06e1a7efe3f3739596397e7b.tar.gz
chromium_src-01f1a4e67343b94b06e1a7efe3f3739596397e7b.tar.bz2
Merge 33919 - Http cache: Don't use multiple validation headers when
dealing with byte range requests. Some servers are not happy with that. BUG=25859 TEST=none Review URL: http://codereview.chromium.org/460098 TBR=rvargas@google.com Review URL: http://codereview.chromium.org/464055 git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@33920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/http/http_cache_transaction.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index b42bf22..17ec780 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -912,7 +912,9 @@ bool HttpCache::Transaction::ConditionalizeRequest() {
}
custom_request_->extra_headers.append(etag_value);
custom_request_->extra_headers.append("\r\n");
- if (partial_.get() && partial_->IsCurrentRangeCached())
+ // For byte-range requests, make sure that we use only one way to validate
+ // the request.
+ if (partial_.get())
return true;
}