Merge pull request mozilla#7642 from Rob--W/crx-type-from-content-disposition-header

timvandermeij · web-flow · commit c0e82dbc38ca · 2016-09-19T01:20:58.000+02:00
Deduct file type from content-disposition if needed
diff --git a/extensions/chromium/pdfHandler.js b/extensions/chromium/pdfHandler.js
@@ -73,9 +73,19 @@ function isPdfFile(details) {
   var header = getHeaderFromHeaders(details.responseHeaders, 'content-type');
   if (header) {
     var headerValue = header.value.toLowerCase().split(';',1)[0].trim();
-    return (headerValue === 'application/pdf' ||
-            headerValue === 'application/octet-stream' &&
-            details.url.toLowerCase().indexOf('.pdf') > 0);
+    if (headerValue === 'application/pdf') {
+      return true;
+    }
+    if (headerValue === 'application/octet-stream') {
+      if (details.url.toLowerCase().indexOf('.pdf') > 0) {
+        return true;
+      }
+      var cdHeader =
+        getHeaderFromHeaders(details.responseHeaders, 'content-disposition');
+      if (cdHeader && /\.pdf(["']|$)/i.test(cdHeader.value)) {
+        return true;
+      }
+    }
   }
 }
 
