Merge pull request #541 from VeliovGroup/dev

v1.9.5
veliovgroup · Dec 18, 2017 · 93747a6 · 93747a6
2 parents 376e46e + 849e5fd
commit 93747a6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.npm/package/npm-shrinkwrap.json b/.npm/package/npm-shrinkwrap.json
diff --git a/.versions b/.versions
@@ -30,7 +30,7 @@ [email protected]
 [email protected]
 [email protected]
 ostrio:[email protected]
-ostrio:[email protected].4
+ostrio:[email protected].5
 [email protected]
 [email protected]
 [email protected]

diff --git a/package.js b/package.js
@@ -1,13 +1,13 @@
 Package.describe({
   name: 'ostrio:files',
-  version: '1.9.4',
+  version: '1.9.5',
   summary: 'File upload via DDP/HTTP to server, 3rd party storage support: AWS S3, GridFS, DropBox and others',
   git: 'https://github.com/VeliovGroup/Meteor-Files',
   documentation: 'README.md'
 });
 
 Npm.depends({
-  'fs-extra': '4.0.3',
+  'fs-extra': '5.0.0',
   'request': '2.83.0',
   'file-type': '7.4.0',
   'eventemitter3': '3.0.0'

diff --git a/server.js b/server.js
@@ -1543,7 +1543,7 @@ export class FilesCollection extends FilesCollectionCore {
       dispositionType = 'inline; ';
     }
 
-    const dispositionName     = `filename=\"${encodeURI(vRef.name || fileRef.name)}\"; filename*=UTF-8''${encodeURI(vRef.name || fileRef.name)}; `;
+    const dispositionName     = `filename=\"${encodeURI(vRef.name || fileRef.name).replace(/\,/g, '%2C')}\"; filename*=UTF-8''${encodeURIComponent(vRef.name || fileRef.name)}; `;
     const dispositionEncoding = 'charset=UTF-8';
 
     if (!http.response.headersSent) {