Merge pull request #29 from qiniu/develop

Release v6.0.1

Author: lidaobing

.travis.yml

@@ -5,9 +5,9 @@ install:
  - sudo apt-get update && sudo apt-get install nunit mono-gmcs cli-common-dev libgl1-mesa-dev libsdl1.2-dev libopenal-dev
 
 before_script:
-  - export QINIU_ACCESS_KEY="IFkgYHCdmdNPWNjMMhk9LAV7guz1wpI5Sp5h8ssK"
-  - export QINIU_SECRET_KEY="R6Nlsu6SQwStqhlDv-e4fMGW3qM4ryBspHgdjAFR"
-  - export QINIU_TEST_BUCKET="icattlecoder3"
+  - export QINIU_ACCESS_KEY="iN7NgwM31j4-BZacMjPrOQBs34UG1maYCAQmhdCV"
+  - export QINIU_SECRET_KEY="6QTOr2Jg1gcZEWDQXKOGZh5PziC2MCV5KsntT70j"
+  - export QINIU_TEST_BUCKET="qtestbucket"
   - export QINIU_TEST_DOMAIN="qiniuphotos.qiniudn.com" 
 
 script:

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## CHANGE LOG
 
+### v6.0.1
+
+2013-09-28 #issue[28](https://github.com/qiniu/csharp-sdk/pull/28)
+
+- 修复Qiniu.RS.Entry实例化时的逻辑判断错误
+- 修复断点续传时会自动对key做urlEncode导致key不一致的错误
+
 ### v6.0.0
 
 2013-07-30 #issue[17](https://github.com/qiniu/csharp-sdk/pull/17)

Docs/README.md

@@ -418,7 +418,7 @@ public static void PutFile(string bucket, string key, string fname)
 
 为防止在上传较大文件时发生GUI界面出现假死现像，c# SDK的内部被设计为异步上传模式，您可以通过注册client的PutFinished事件获取上传结果。该事件无论上传是否会成功，都会被触发。
 
-
+**注意： key必须采用utf8编码，如使用非utf8编码访问七牛云存储将反馈错误**
 
 <a name=resumable-io-upload></a>
 ### 5.2.2 断点续上传
@@ -476,6 +476,8 @@ public event EventHandler<PutNotifyErrorEvent> NotifyErr;
 
 其中<domain>可以到[七牛云存储开发者自助网站](https://portal.qiniu.com/)绑定, 域名可以使用自己一级域名的或者是由七牛提供的二级域名(`<bucket>.qiniudn.com`)。注意，尖括号不是必需，代表替换项。
 
+**注意： key必须采用utf8编码，如使用非utf8编码访问七牛云存储将反馈错误**
+
 <a name=private-download></a>
 #### 5.3.2 私有资源下载
 私有资源必须通过临时下载授权凭证(downloadToken)下载，如下：

Qiniu/RS/Entry.cs

@@ -40,7 +40,7 @@ public class Entry : CallRet
 		public Entry (CallRet ret)
             : base(ret)
 		{
-			if (OK && string.IsNullOrEmpty (Response)) {
+			if (OK && !string.IsNullOrEmpty (Response)) {
 				try {
 					Unmarshal (Response);
 				} catch (Exception e) {

Qiniu/RS/GetPolicy.cs

@@ -29,7 +29,7 @@ public static string MakeRequest (string baseUrl, UInt32 expires = 3600, Mac mac
 
 		public static string MakeBaseUrl (string domain, string key)
 		{
-			return string.Format ("http://{0}/{1}", domain, System.Web.HttpUtility.UrlEncode (key));
+			return string.Format ("http://{0}/{1}", domain, key);
 		}
 	}
 }

Qiniu/RS/RSPath.cs

@@ -20,7 +20,7 @@ public string Bucket {
 		/// 文件key
 		/// </summary>
 		public string Key {
-			get { return System.Web.HttpUtility.UrlEncode (key); }
+			get { return key; }
 		}
 
 		private string uri;