Release 2.0.6

aliyun · Mar 29, 2016 · 64081f9 · 64081f9
1 parent 1a046a8
commit 64081f9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # ChangeLog - Aliyun OSS SDK for PHP
 
+## v2.0.6
+
+* Trim access key id/secret and endpoint
+* Refine tests and setup travis CI
+
 ## v2.0.5
 
 * 增加Add/Delete/Get BucketCname接口

diff --git a/src/OSS/OssClient.php b/src/OSS/OssClient.php
@@ -65,9 +65,9 @@ class OssClient
      */
     public function __construct($accessKeyId, $accessKeySecret, $endpoint, $isCName = false, $securityToken = NULL)
     {
-    	$accessKeyId = trim($accessKeyId);
-	$accessKeySecret = trim($accessKeySecret);
-	$endpoint = trim(trim($endpoint), "/");
+        $accessKeyId = trim($accessKeyId);
+        $accessKeySecret = trim($accessKeySecret);
+        $endpoint = trim(trim($endpoint), "/");
 
         if (empty($accessKeyId)) {
             throw new OssException("access key id is empty");
@@ -2124,8 +2124,8 @@ public function setConnectTimeout($connectTimeout)
     );
     // OssClient版本信息
     const OSS_NAME = "aliyun-sdk-php";
-    const OSS_VERSION = "2.0.5";
-    const OSS_BUILD = "20160126";
+    const OSS_VERSION = "2.0.6";
+    const OSS_BUILD = "20160329";
     const OSS_AUTHOR = "";
     const OSS_OPTIONS_ORIGIN = 'Origin';
     const OSS_OPTIONS_REQUEST_METHOD = 'Access-Control-Request-Method';