Merge aca5b48 into f7799a7

pkgcloud · Sep 9, 2015 · 6233ca5 · 6233ca5
2 parents f7799a7 + aca5b48
commit 6233ca5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/pkgcloud/core/base/client.js b/lib/pkgcloud/core/base/client.js
@@ -84,6 +84,10 @@ Client.prototype._request = function (options, callback) {
     requestOptions.body = options.body;
   }
 
+  if (options.encoding || options.encoding === null) {
+    requestOptions.encoding = options.encoding;
+  }
+
   if (options.container) {
     requestOptions.signingUrl = '/' + options.container + '/';
 

diff --git a/lib/pkgcloud/openstack/storage/client/files.js b/lib/pkgcloud/openstack/storage/client/files.js
@@ -203,7 +203,8 @@ exports.download = function (options, callback) {
     container: container,
     path: options.remote,
     download: true,
-    headers: options.headers
+    headers: options.headers,
+    encoding: null
   }, success);
 
   if (inputStream) {