support emptybody

aliyun · Dec 11, 2017 · e0730a5 · e0730a5
1 parent 7e0f42d
commit e0730a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/OSS/OssClient.php b/src/OSS/OssClient.php
@@ -1057,7 +1057,6 @@ public function appendObject($bucket, $object, $content, $position, $options = N
     {
         $this->precheckCommon($bucket, $object, $options);
 
-        OssUtil::validateContent($content);
         $options[self::OSS_CONTENT] = $content;
         $options[self::OSS_BUCKET] = $bucket;
         $options[self::OSS_METHOD] = self::OSS_HTTP_POST;

diff --git a/tests/OSS/Tests/CallbackTest.php b/tests/OSS/Tests/CallbackTest.php
@@ -47,7 +47,7 @@ public function testMultipartUploadCallbackNormal()
 
         $json = 
         '{
-            "callbackUrl":"callback.oss-demo.com:23450",
+            "callbackUrl":"oss-demo.aliyuncs.com:23450",
             "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
             "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}",
             "callbackBodyType":"application/json"
@@ -139,7 +139,7 @@ public function testPutObjectCallbackNormal()
         {
             $json = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size}}",
                 "callbackBodyType":"application/json"
@@ -151,7 +151,7 @@ public function testPutObjectCallbackNormal()
        {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}",
                 "callbackBodyType":"application/x-www-form-urlencoded"
@@ -163,7 +163,7 @@ public function testPutObjectCallbackNormal()
        {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}"
             }';
@@ -174,7 +174,7 @@ public function testPutObjectCallbackNormal()
         {
             $json = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\" 春水碧于天，画船听雨眠。\":\"垆边人似月，皓腕凝霜雪。\"}",
                 "callbackBodyType":"application/json"
@@ -186,7 +186,7 @@ public function testPutObjectCallbackNormal()
         {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"春水碧于天，画船听雨眠。垆边人似月，皓腕凝霜雪",
                 "callbackBodyType":"application/x-www-form-urlencoded"
@@ -198,7 +198,7 @@ public function testPutObjectCallbackNormal()
         {
             $json = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}",
                 "callbackBodyType":"application/json"
@@ -218,7 +218,7 @@ public function testPutObjectCallbackNormal()
         {
             $url = 
             '{
-                "callbackUrl":"callback.oss-demo.com:23450",
+                "callbackUrl":"oss-demo.aliyuncs.com:23450",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}&my_var1=${x:var1}&my_var2=${x:var2}",
                 "callbackBodyType":"application/x-www-form-urlencoded"