PDF.js version 2.0.326 - See mozilla/pdf.js@24f96e0f713c13ba1b0678bcc228ec2b77f81341

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "2.0.323",
+  "version": "2.0.326",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"

build/pdf.js

@@ -3311,7 +3311,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
   if (worker.destroyed) {
     return Promise.reject(new Error('Worker was destroyed'));
   }
-  var apiVersion = '2.0.323';
+  var apiVersion = '2.0.326';
   source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
   source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
   source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
@@ -4700,8 +4700,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
 }();
 var version, build;
 {
-  exports.version = version = '2.0.323';
+  exports.version = version = '2.0.326';
-  exports.build = build = 'db9f71fe';
+  exports.build = build = '24f96e0f';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;
@@ -7459,8 +7459,8 @@ exports.SVGGraphics = SVGGraphics;
 "use strict";
 
 
-var pdfjsVersion = '2.0.323';
+var pdfjsVersion = '2.0.326';
-var pdfjsBuild = 'db9f71fe';
+var pdfjsBuild = '24f96e0f';
 var pdfjsSharedUtil = __w_pdfjs_require__(0);
 var pdfjsDisplayGlobal = __w_pdfjs_require__(120);
 var pdfjsDisplayAPI = __w_pdfjs_require__(58);
@@ -12745,8 +12745,8 @@ if (!_global_scope2.default.PDFJS) {
 }
 var PDFJS = _global_scope2.default.PDFJS;
 {
-  PDFJS.version = '2.0.323';
+  PDFJS.version = '2.0.326';
-  PDFJS.build = 'db9f71fe';
+  PDFJS.build = '24f96e0f';
 }
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {
@@ -16370,7 +16370,7 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = [
 
 function getFilenameFromContentDispositionHeader(contentDisposition) {
   var needsEncodingFixup = true;
-  var tmp = /(?:^|;)\s*filename\*\s*=\s*([^;\s]+)/i.exec(contentDisposition);
+  var tmp = toParamRegExp('filename\\*', 'i').exec(contentDisposition);
   if (tmp) {
     tmp = tmp[1];
     var filename = rfc2616unquote(tmp);
@@ -16384,13 +16384,16 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
     var _filename = rfc2047decode(tmp);
     return fixupEncoding(_filename);
   }
-  tmp = /(?:^|;)\s*filename\s*=\s*([^;\s]+)/.exec(contentDisposition);
+  tmp = toParamRegExp('filename', 'i').exec(contentDisposition);
   if (tmp) {
     tmp = tmp[1];
     var _filename2 = rfc2616unquote(tmp);
     _filename2 = rfc2047decode(_filename2);
     return fixupEncoding(_filename2);
   }
+  function toParamRegExp(attributePattern, flags) {
+    return new RegExp('(?:^|;)\\s*' + attributePattern + '\\s*=\\s*' + '(' + '[^";\\s][^;\\s]*' + '|' + '"(?:[^"\\\\]|\\\\"?)+"?' + ')', flags);
+  }
   function textdecode(encoding, value) {
     if (encoding) {
       if (!/^[^\x00-\xFF]+$/.test(value)) {
@@ -16422,7 +16425,7 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
   function rfc2231getparam(contentDisposition) {
     var matches = [],
         match = void 0;
-    var iter = /(?:^|;)\s*filename\*((?!0\d)\d+)(\*?)\s*=\s*([^;\s]+)/ig;
+    var iter = toParamRegExp('filename\\*((?!0\\d)\\d+)(\\*?)', 'ig');
     while ((match = iter.exec(contentDisposition)) !== null) {
       var _match = match,
           _match2 = _slicedToArray(_match, 4),
@@ -16489,7 +16492,7 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
     if (value.slice(0, 2) !== '=?' || /[\x00-\x19\x80-\xff]/.test(value)) {
       return value;
     }
-    return value.replace(/=\?([\w\-]*)\?([QqBb])\?((?:[^?]|\?(?!=))*)\?=/g, function (_, charset, encoding, text) {
+    return value.replace(/=\?([\w-]*)\?([QqBb])\?((?:[^?]|\?(?!=))*)\?=/g, function (_, charset, encoding, text) {
       if (encoding === 'q' || encoding === 'Q') {
         text = text.replace(/_/g, ' ');
         text = text.replace(/=([0-9a-fA-F]{2})/g, function (_, hex) {

build/pdf.worker.js

@@ -22307,8 +22307,8 @@ exports.PostScriptCompiler = PostScriptCompiler;
 "use strict";
 
 
-var pdfjsVersion = '2.0.323';
+var pdfjsVersion = '2.0.326';
-var pdfjsBuild = 'db9f71fe';
+var pdfjsBuild = '24f96e0f';
 var pdfjsCoreWorker = __w_pdfjs_require__(74);
 exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
 
@@ -22521,7 +22521,7 @@ var WorkerMessageHandler = {
     var cancelXHRs = null;
     var WorkerTasks = [];
     var apiVersion = docParams.apiVersion;
-    var workerVersion = '2.0.323';
+    var workerVersion = '2.0.326';
     if (apiVersion !== null && apiVersion !== workerVersion) {
       throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
     }

lib/core/worker.js

@@ -223,7 +223,7 @@ var WorkerMessageHandler = {
     var cancelXHRs = null;
     var WorkerTasks = [];
     var apiVersion = docParams.apiVersion;
-    var workerVersion = '2.0.323';
+    var workerVersion = '2.0.326';
     if (apiVersion !== null && apiVersion !== workerVersion) {
       throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
     }

lib/display/api.js

@@ -178,7 +178,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
   if (worker.destroyed) {
     return Promise.reject(new Error('Worker was destroyed'));
   }
-  var apiVersion = '2.0.323';
+  var apiVersion = '2.0.326';
   source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
   source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
   source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
@@ -1567,8 +1567,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
 }();
 var version, build;
 {
-  exports.version = version = '2.0.323';
+  exports.version = version = '2.0.326';
-  exports.build = build = 'db9f71fe';
+  exports.build = build = '24f96e0f';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;

lib/display/content_disposition.js

@@ -29,7 +29,7 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = [
 
 function getFilenameFromContentDispositionHeader(contentDisposition) {
   var needsEncodingFixup = true;
-  var tmp = /(?:^|;)\s*filename\*\s*=\s*([^;\s]+)/i.exec(contentDisposition);
+  var tmp = toParamRegExp('filename\\*', 'i').exec(contentDisposition);
   if (tmp) {
     tmp = tmp[1];
     var filename = rfc2616unquote(tmp);
@@ -43,13 +43,16 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
     var _filename = rfc2047decode(tmp);
     return fixupEncoding(_filename);
   }
-  tmp = /(?:^|;)\s*filename\s*=\s*([^;\s]+)/.exec(contentDisposition);
+  tmp = toParamRegExp('filename', 'i').exec(contentDisposition);
   if (tmp) {
     tmp = tmp[1];
     var _filename2 = rfc2616unquote(tmp);
     _filename2 = rfc2047decode(_filename2);
     return fixupEncoding(_filename2);
   }
+  function toParamRegExp(attributePattern, flags) {
+    return new RegExp('(?:^|;)\\s*' + attributePattern + '\\s*=\\s*' + '(' + '[^";\\s][^;\\s]*' + '|' + '"(?:[^"\\\\]|\\\\"?)+"?' + ')', flags);
+  }
   function textdecode(encoding, value) {
     if (encoding) {
       if (!/^[^\x00-\xFF]+$/.test(value)) {
@@ -81,7 +84,7 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
   function rfc2231getparam(contentDisposition) {
     var matches = [],
         match = void 0;
-    var iter = /(?:^|;)\s*filename\*((?!0\d)\d+)(\*?)\s*=\s*([^;\s]+)/ig;
+    var iter = toParamRegExp('filename\\*((?!0\\d)\\d+)(\\*?)', 'ig');
     while ((match = iter.exec(contentDisposition)) !== null) {
       var _match = match,
           _match2 = _slicedToArray(_match, 4),
@@ -148,7 +151,7 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
     if (value.slice(0, 2) !== '=?' || /[\x00-\x19\x80-\xff]/.test(value)) {
       return value;
     }
-    return value.replace(/=\?([\w\-]*)\?([QqBb])\?((?:[^?]|\?(?!=))*)\?=/g, function (_, charset, encoding, text) {
+    return value.replace(/=\?([\w-]*)\?([QqBb])\?((?:[^?]|\?(?!=))*)\?=/g, function (_, charset, encoding, text) {
       if (encoding === 'q' || encoding === 'Q') {
         text = text.replace(/_/g, ' ');
         text = text.replace(/=([0-9a-fA-F]{2})/g, function (_, hex) {

lib/display/global.js

@@ -51,8 +51,8 @@ if (!_global_scope2.default.PDFJS) {
 }
 var PDFJS = _global_scope2.default.PDFJS;
 {
-  PDFJS.version = '2.0.323';
+  PDFJS.version = '2.0.326';
-  PDFJS.build = 'db9f71fe';
+  PDFJS.build = '24f96e0f';
 }
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {

lib/pdf.js

@@ -21,8 +21,8 @@
  */
 'use strict';
 
-var pdfjsVersion = '2.0.323';
+var pdfjsVersion = '2.0.326';
-var pdfjsBuild = 'db9f71fe';
+var pdfjsBuild = '24f96e0f';
 var pdfjsSharedUtil = require('./shared/util.js');
 var pdfjsDisplayGlobal = require('./display/global.js');
 var pdfjsDisplayAPI = require('./display/api.js');

lib/pdf.worker.js

@@ -21,7 +21,7 @@
  */
 'use strict';
 
-var pdfjsVersion = '2.0.323';
+var pdfjsVersion = '2.0.326';
-var pdfjsBuild = 'db9f71fe';
+var pdfjsBuild = '24f96e0f';
 var pdfjsCoreWorker = require('./core/worker.js');
 exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;

lib/test/unit/network_utils_spec.js

@@ -163,11 +163,26 @@ describe('network_utils', function () {
           return 'attachment; filename="filename.pdf"';
         }
       })).toEqual('filename.pdf');
+      expect((0, _network_utils.extractFilenameFromHeader)(function (headerName) {
+        if (headerName === 'Content-Disposition') {
+          return 'attachment; filename="filename.pdf and spaces.pdf"';
+        }
+      })).toEqual('filename.pdf and spaces.pdf');
+      expect((0, _network_utils.extractFilenameFromHeader)(function (headerName) {
+        if (headerName === 'Content-Disposition') {
+          return 'attachment; filename="tl;dr.pdf"';
+        }
+      })).toEqual('tl;dr.pdf');
       expect((0, _network_utils.extractFilenameFromHeader)(function (headerName) {
         if (headerName === 'Content-Disposition') {
           return 'attachment; filename=filename.pdf';
         }
       })).toEqual('filename.pdf');
+      expect((0, _network_utils.extractFilenameFromHeader)(function (headerName) {
+        if (headerName === 'Content-Disposition') {
+          return 'attachment; filename=filename.pdf someotherparam';
+        }
+      })).toEqual('filename.pdf');
     });
     it('gets the filename from the response header (RFC 6266)', function () {
       expect((0, _network_utils.extractFilenameFromHeader)(function (headerName) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "2.0.323",
+  "version": "2.0.326",
   "main": "build/pdf.js",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [