From df516c0a52f6f0ca41a38df065320b0e3a466960 Mon Sep 17 00:00:00 2001 From: Rob Wu Date: Wed, 21 Mar 2018 15:44:31 +0100 Subject: [PATCH] [CRX] Stop intercepting ftp in Chrome 59+ The extension cannot easily fetch data from ftp:-resources any more in Chrome 59+. So don't intercept such URLs. --- extensions/chromium/pdfHandler.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/extensions/chromium/pdfHandler.js b/extensions/chromium/pdfHandler.js index 905d51fa1..0eba4e34b 100644 --- a/extensions/chromium/pdfHandler.js +++ b/extensions/chromium/pdfHandler.js @@ -153,10 +153,16 @@ chrome.webRequest.onBeforeRequest.addListener( urls: [ 'file://*/*.pdf', 'file://*/*.PDF', - // Note: Chrome 59 has disabled ftp resource loading by default: - // https://www.chromestatus.com/feature/5709390967472128 - 'ftp://*/*.pdf', - 'ftp://*/*.PDF', + ...( + // Duck-typing: MediaError.prototype.message was added in Chrome 59. + MediaError.prototype.hasOwnProperty('message') ? [] : + [ + // Note: Chrome 59 has disabled ftp resource loading by default: + // https://www.chromestatus.com/feature/5709390967472128 + 'ftp://*/*.pdf', + 'ftp://*/*.PDF', + ] + ), ], types: ['main_frame', 'sub_frame'], },