Merge pull request #89 from killme2008/develop

Develop

Author: longshanksmo

qiniu/io.js

@@ -27,9 +27,9 @@ function PutExtra(params, mimeType, crc32, checkCrc) {
 function PutRet(hash, key) {
   this.hash = hash || null;
   this.key = key || null;
-} 
+}
 
-// onret: callback function instead of ret 
+// onret: callback function instead of ret
 function put(uptoken, key, body, extra, onret) {
   if(!extra) {
     extra = new PutExtra();
@@ -59,8 +59,8 @@ function getMultipart(uptoken, key, body, extra) {
   if(key != exports.UNDEFINED_KEY) {
     form.field('key', key);
   }
-
-  form.buffer('file', new Buffer(body), key, extra.mimeType);
+  var buf = Buffer.isBuffer(body) ? body : new Buffer(body);
+  form.buffer('file', buf, key, extra.mimeType);
 
   //extra['checkcrc']
   if (extra.checkCrc == 1) {
@@ -100,4 +100,3 @@ function putFile(uptoken, key, loadFile, extra, onret) {
 function putFileWithoutKey(uptoken, loadFile, extra, onret) {
   putFile(uptoken, null, loadFile, extra, onret);
 }
-