wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 831450 - No Range Requests against weak Etag r=mayhemer

Browse Source
This commit is contained in:
Patrick McManus 2016-02-19 16:09:16 -05:00
parent 092394bae5
commit 94632bfb7b
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -2419,12 +2419,13 @@ nsHttpChannel::IsResumable(int64_t partialLen, int64_t contentLength,
bool ignoreMissingPartialLen) const
{
bool hasContentEncoding =
mCachedResponseHead->PeekHeader(nsHttp::Content_Encoding)
!= nullptr;
(mCachedResponseHead->PeekHeader(nsHttp::Content_Encoding) != nullptr);
const char *etag = mCachedResponseHead->PeekHeader(nsHttp::ETag);
bool hasWeakEtag = etag && !strncmp(etag, "W/", 2);
return (partialLen < contentLength) &&
(partialLen > 0 || ignoreMissingPartialLen) &&
!hasContentEncoding &&
!hasContentEncoding && !hasWeakEtag &&
mCachedResponseHead->IsResumable() &&
!mCustomConditionalRequest &&
!mCachedResponseHead->NoStore();

41
netwerk/test/unit/test_range_requests.js
View File

@ -338,6 +338,42 @@ function received_partial_8(request, data) {
chan.asyncOpen2(new FailedChannelListener(testFinished, null, CL_EXPECT_LATE_FAILURE));
}
var case_9_request_no = 0;
function handler_9(metadata, response) {
switch (case_9_request_no) {
case 0:
do_check_false(metadata.hasHeader("Range"));
response.setHeader("Content-Type", "text/plain", false);
response.setHeader("ETag", "W/test9WeakEtag");
response.setHeader("Accept-Ranges", "bytes");
response.setHeader("Cache-Control", "max-age=360000");
response.setHeader("Content-Length", "10");
response.processAsync();
response.bodyOutputStream.write(simpleBody.slice(0, 4), 4);
response.finish(); // truncated response
break;
case 1:
do_check_false(metadata.hasHeader("Range"));
response.setHeader("Content-Type", "text/plain", false);
response.setHeader("ETag", "W/test9WeakEtag");
response.setHeader("Accept-Ranges", "bytes");
response.setHeader("Cache-Control", "max-age=360000");
response.setHeader("Content-Length", "10");
response.processAsync();
response.bodyOutputStream.write(simpleBody, 10);
response.finish(); // full response
break;
default:
response.setStatusLine(metadata.httpVersion, 404, "Not Found");
}
case_9_request_no++;
}
function received_partial_9(request, data) {
do_check_eq(partial_data_length, data.length);
var chan = make_channel("http://localhost:" + port + "/test_9");
chan.asyncOpen2(new ChannelListener(received_simple, null));
}
// Simple mechanism to keep track of tests and stop the server
var numTestsFinished = 0;
function testFinished() {
@ -354,6 +390,7 @@ function run_test() {
httpserver.registerPathHandler("/test_6", handler_6);
httpserver.registerPathHandler("/test_7", handler_7);
httpserver.registerPathHandler("/test_8", handler_8);
httpserver.registerPathHandler("/test_9", handler_9);
httpserver.start(-1);
port = httpserver.identity.primaryPort;
@ -389,5 +426,9 @@ function run_test() {
var chan = make_channel("http://localhost:" + port + "/test_8");
chan.asyncOpen2(new MyListener(received_partial_8));
// Case 9: check that weak etag is not used for a range request
var chan = make_channel("http://localhost:" + port + "/test_9");
chan.asyncOpen2(new MyListener(received_partial_9));
do_test_pending();
}