From 1e3180dac0bb9e5a64d0ce81ec8fdd0424b2dfbf Mon Sep 17 00:00:00 2001
From: Pdf Bot <pdfjsbot@gmail.com>
Date: Mon, 9 Nov 2015 21:42:07 +0000
Subject: [PATCH] PDF.js version 1.2.87 - See
 mozilla/pdf.js@3c6df26704c23ccac81ec4c616c3b88b8bcbec26

---
 bower.json            |  2 +-
 build/pdf.combined.js | 10 ++++++----
 build/pdf.js          |  4 ++--
 build/pdf.worker.js   | 10 ++++++----
 package.json          |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/bower.json b/bower.json
index 6da260a5f..55c2e298b 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.2.85",
+  "version": "1.2.87",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 500ebb336..e3b48dd02 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.2.85';
-PDFJS.build = '5b2015b';
+PDFJS.version = '1.2.87';
+PDFJS.build = '3c6df26';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -8427,11 +8427,13 @@ var NetworkManager = (function NetworkManagerClosure() {
         });
       } else if (pendingRequest.onProgressiveData) {
         pendingRequest.onDone(null);
-      } else {
+      } else if (chunk) {
         pendingRequest.onDone({
           begin: 0,
           chunk: chunk
         });
+      } else if (pendingRequest.onError) {
+        pendingRequest.onError(xhr.status);
       }
     },
 
@@ -41160,7 +41162,7 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
 
         onError: function onError(status) {
           var exception;
-          if (status === 404) {
+          if (status === 404 || status === 0 && /^file:/.test(source.url)) {
             exception = new MissingPDFException('Missing PDF "' +
                                                 source.url + '".');
             handler.send('MissingPDF', exception);
diff --git a/build/pdf.js b/build/pdf.js
index d3ff42bc8..00289db32 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.2.85';
-PDFJS.build = '5b2015b';
+PDFJS.version = '1.2.87';
+PDFJS.build = '3c6df26';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index 3ebb74b6e..a3db13d88 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.2.85';
-PDFJS.build = '5b2015b';
+PDFJS.version = '1.2.87';
+PDFJS.build = '3c6df26';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -1847,11 +1847,13 @@ var NetworkManager = (function NetworkManagerClosure() {
         });
       } else if (pendingRequest.onProgressiveData) {
         pendingRequest.onDone(null);
-      } else {
+      } else if (chunk) {
         pendingRequest.onDone({
           begin: 0,
           chunk: chunk
         });
+      } else if (pendingRequest.onError) {
+        pendingRequest.onError(xhr.status);
       }
     },
 
@@ -34580,7 +34582,7 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
 
         onError: function onError(status) {
           var exception;
-          if (status === 404) {
+          if (status === 404 || status === 0 && /^file:/.test(source.url)) {
             exception = new MissingPDFException('Missing PDF "' +
                                                 source.url + '".');
             handler.send('MissingPDF', exception);
diff --git a/package.json b/package.json
index 6b920f1c3..91ff227fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.2.85",
+  "version": "1.2.87",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",