Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3178 from yurydelendik/issue3156

Browse Source 
Cherry-pick of #3157
This commit is contained in:
Yury Delendik 2013-04-30 10:23:24 -07:00
commit 3c0705d0ee
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/chunked_stream.js
View File

@ -363,7 +363,8 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
var loadedRequests = []; var loadedRequests = [];
for (var chunk = beginChunk; chunk < endChunk; ++chunk) { for (var chunk = beginChunk; chunk < endChunk; ++chunk) {
var requestIds = this.requestsByChunk[chunk]; // The server might return more chunks than requested
var requestIds = this.requestsByChunk[chunk] || [];
delete this.requestsByChunk[chunk]; delete this.requestsByChunk[chunk];
for (var i = 0; i < requestIds.length; ++i) { for (var i = 0; i < requestIds.length; ++i) {

19
src/network.js
View File

@ -36,6 +36,10 @@
//#endif //#endif
var NetworkManager = (function NetworkManagerClosure() { var NetworkManager = (function NetworkManagerClosure() {
var OK_RESPONSE = 200;
var PARTIAL_CONTENT_RESPONSE = 206;
function NetworkManager(url, args) { function NetworkManager(url, args) {
this.url = url; this.url = url;
args = args || {}; args = args || {};
@ -156,7 +160,15 @@ var NetworkManager = (function NetworkManagerClosure() {
return; return;
} }
if (xhr.status !== pendingRequest.expectedStatus) { // From http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.2:
// "A server MAY ignore the Range header". This means it's possible to
// get a 200 rather than a 206 response from a range request.
var ok_response_on_range_request =
xhr.status === OK_RESPONSE &&
pendingRequest.expectedStatus === PARTIAL_CONTENT_RESPONSE;
if (!ok_response_on_range_request &&
xhr.status !== pendingRequest.expectedStatus) {
if (pendingRequest.onError) { if (pendingRequest.onError) {
pendingRequest.onError(xhr.status); pendingRequest.onError(xhr.status);
} }
@ -166,18 +178,17 @@ var NetworkManager = (function NetworkManagerClosure() {
this.loadedRequests[xhrId] = true; this.loadedRequests[xhrId] = true;
var chunk = getArrayBuffer(xhr); var chunk = getArrayBuffer(xhr);
if (pendingRequest.expectedStatus === 206) { if (xhr.status === PARTIAL_CONTENT_RESPONSE) {
var rangeHeader = xhr.getResponseHeader('Content-Range'); var rangeHeader = xhr.getResponseHeader('Content-Range');
var matches = /bytes (\d+)-(\d+)\/(\d+)/.exec(rangeHeader); var matches = /bytes (\d+)-(\d+)\/(\d+)/.exec(rangeHeader);
var begin = parseInt(matches[1], 10); var begin = parseInt(matches[1], 10);
var end = parseInt(matches[2], 10) + 1;
pendingRequest.onDone({ pendingRequest.onDone({
begin: begin, begin: begin,
end: end,
chunk: chunk chunk: chunk
}); });
} else { } else {
pendingRequest.onDone({ pendingRequest.onDone({
begin: 0,
chunk: chunk chunk: chunk
}); });
} }