Merge remote-tracking branch 'upstream/master' into cmykjpgnorm

README.md

@@ -29,7 +29,7 @@ using the pdf.js API.
 
 ### Extension
 
-A up-to-date Firefox extension is also available:
+An up-to-date Firefox extension is also available:
 
 + http://mozilla.github.com/pdf.js/extensions/firefox/pdf.js.xpi
 

extensions/firefox/components/pdfContentHandler.js

@@ -52,7 +52,7 @@ pdfContentHandler.prototype = {
     }
 
     let targetUrl = aRequest.URI.spec;
-    if (targetUrl.indexOf('?pdfjs.action=download') >= 0)
+    if (targetUrl.indexOf('#pdfjs.action=download') >= 0)
       throw NS_ERROR_WONT_HANDLE_CONTENT;
 
     aRequest.cancel(Cr.NS_BINDING_ABORTED);

test/test.py

@@ -321,7 +321,7 @@ def verifyPDFs(manifestList):
     for item in manifestList:
         f = item['file']
         if os.access(f, os.R_OK):
-            fileMd5 = hashlib.md5(open(f).read()).hexdigest()
+            fileMd5 = hashlib.md5(open(f, 'rb').read()).hexdigest()
             if 'md5' not in item:
                 print 'ERROR: Missing md5 for file "' + f + '".',
                 print 'Hash for current file is "' + fileMd5 + '"'

web/viewer.js

@@ -139,7 +139,7 @@ var PDFView = {
   },
 
   download: function pdfViewDownload() {
-    window.open(this.url + '?pdfjs.action=download', '_parent');
+    window.open(this.url + '#pdfjs.action=download', '_parent');
   },
 
   navigateTo: function pdfViewNavigateTo(dest) {