Merge pull request #96 from qiniu/develop

Release v6.1.2

Author: xushiwei

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## CHANGE LOG
 
+### v6.1.2
+
+2014-2-17 issue [#96](https://github.com/qiniu/nodejs-sdk/pull/96)
+
+- Content-Length = 0 时的细节修复
+
+
 ### v6.1.1
 
 2013-12-5 issue [#90](https://github.com/qiniu/nodejs-sdk/pull/90)

Makefile

@@ -1,5 +1,5 @@
 TESTS = test/*.test.js
-TIMEOUT = 15000
+TIMEOUT = 25000
 REPORTER = spec
 MOCHA_OPTS = 
 test: 

docs/README.gist.md

@@ -69,7 +69,7 @@ Node.js SDK 主要包含对七牛云存储API的包装，遵循[qiniu sdkspec](h
 
 <sdk安装说明\>
 通过 npm 以 node 模块化的方式安装：  
-`npm node qiniu`
+`$ npm install qiniu`
 
 <a name="appkey"></a>
 

docs/README.md

@@ -69,7 +69,7 @@ Node.js SDK 主要包含对七牛云存储API的包装，遵循[qiniu sdkspec](h
 
 <sdk安装说明\>
 通过 npm 以 node 模块化的方式安装：  
-`npm node qiniu`
+`$ npm install qiniu`
 
 <a name="appkey"></a>
 
@@ -533,7 +533,7 @@ qiniu.rsf.listPrefix(bucketname, prefix, marker, limit, function(err, ret) {
 
 ```{javascript}
 // 生成访问图片的url
-var url = qiniu.rs.makeBaseUrl(bucketName, key);
+var url = qiniu.rs.makeBaseUrl(domain, key);
 
 // 生成fop_url
 var ii = new qiniu.fop.ImageInfo();
@@ -551,7 +551,7 @@ console.log('在浏览器输入: ' + url);
 
 ```{javascript}
 // 生成访问图片的url
-var url = qiniu.rs.makeBaseUrl(bucketName, key);
+var url = qiniu.rs.makeBaseUrl(domain, key);
 
 // 生成fop_url
 var exif = new qiniu.fop.Exif();
@@ -569,7 +569,7 @@ console.log('在浏览器输入: ' + url);
 
 ```{javascript}
 // 生成访问图片的url
-var url = qiniu.rs.makeBaseUrl(bucketName, key);
+var url = qiniu.rs.makeBaseUrl(domain, key);
 
 // 生成fop_url
 var iv = new qiniu.fop.ImageView();

docs/gist/fop.js

@@ -3,11 +3,11 @@ var qiniu = require('../../');
 qiniu.conf.ACCESS_KEY = '8Y7uZY0cqHxAyGK27V_B2Bxf8IhAkqEPOHr6iwwc';
 qiniu.conf.SECRET_KEY = '1uvFVvk9IqFRQ6t4TCr-DdeXybTbSS0gauJrYiJN';
 
-var bucketName = 'test369.qiniudn.com';
+var domain = 'test369.qiniudn.com';
 var key = 'logo.png';
 // @gist makeImageInfoUrl
 // 生成访问图片的url
-var url = qiniu.rs.makeBaseUrl(bucketName, key);
+var url = qiniu.rs.makeBaseUrl(domain, key);
 
 // 生成fop_url
 var ii = new qiniu.fop.ImageInfo();
@@ -23,7 +23,7 @@ console.log('在浏览器输入: ' + url);
 
 // @gist makeExifUrl
 // 生成访问图片的url
-var url = qiniu.rs.makeBaseUrl(bucketName, key);
+var url = qiniu.rs.makeBaseUrl(domain, key);
 
 // 生成fop_url
 var exif = new qiniu.fop.Exif();
@@ -40,7 +40,7 @@ console.log('在浏览器输入: ' + url);
 // @gist makeImageViewUrl
 
 // 生成访问图片的url
-var url = qiniu.rs.makeBaseUrl(bucketName, key);
+var url = qiniu.rs.makeBaseUrl(domain, key);
 
 // 生成fop_url
 var iv = new qiniu.fop.ImageView();

qiniu/rpc.js

@@ -34,27 +34,27 @@ function post(uri, form, headers, onresp) {
   headers = headers || {};
   headers['User-Agent'] = headers['User-Agent'] || conf.USER_AGENT;
 
-  var content = null;
-  if (Buffer.isBuffer(form) || typeof form === 'string') {
-    content = form;
-    form = null;
-  }
-
-  var req = urllib.request(uri, {
+  var data = {
     headers: headers,
     method: 'POST',
-    content: content,
     dataType: 'json',
     timeout: conf.RPC_TIMEOUT,
-  }, function (err, result, res) {
-    if (err) {
-      err.code = res && res.statusCode || -1;
+  };
+
+  if (Buffer.isBuffer(form) || typeof form === 'string') {
+    data.content = form;
+  } else if (form) {
+    data.stream = form;
+  } else {
+    data.headers['Content-Length'] = 0;
+  };
+
+  var req = urllib.request(uri, data, function(err, result, res) {
+    var rerr = null;
+    if (err || Math.floor(res.statusCode/100) !== 2) {
+      rerr = {code: res&&res.statusCode||-1, error: err||result.error||''};
     }
-    onresp(err, result, res);
+    onresp(rerr, result, res);
   });
-
-  if (form) {
-    form.pipe(req);
-  }
 }