From 09b7048ac341476edc2c03252f469b4bc11a8eae Mon Sep 17 00:00:00 2001 From: dtynn Date: Mon, 17 Feb 2014 11:40:25 +0800 Subject: [PATCH 1/3] transform --- docs/gist/logo.jpg | Bin 0 -> 8556 bytes qiniu/rs.php | 8 ++++++++ tests/IoTest.php | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 docs/gist/logo.jpg diff --git a/docs/gist/logo.jpg b/docs/gist/logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9c1a57e13d42e262f3c462e0429284478557d48b GIT binary patch literal 8556 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 SuaNt{IJf(M_#F#v^1lI>M|-FM literal 0 HcmV?d00001 diff --git a/qiniu/rs.php b/qiniu/rs.php index db79caa3..9d3726ec 100644 --- a/qiniu/rs.php +++ b/qiniu/rs.php @@ -55,6 +55,8 @@ class Qiniu_RS_PutPolicy public $SaveKey; public $PersistentOps; public $PersistentNotifyUrl; + public $Transform; + public $FopTimeout; public function __construct($scope) { @@ -106,6 +108,12 @@ public function Token($mac) // => $token if (!empty($this->PersistentNotifyUrl)) { $policy['persistentNotifyUrl'] = $this->PersistentNotifyUrl; } + if (!empty($this->Transform)) { + $policy['transform'] = $this->Transform; + } + if (!empty($this->FopTimeout)) { + $policy['fopTimeout'] = $this->FopTimeout; + } $b = json_encode($policy); return Qiniu_SignWithData($mac, $b); diff --git a/tests/IoTest.php b/tests/IoTest.php index 5ba0fd0f..488ca0e5 100644 --- a/tests/IoTest.php +++ b/tests/IoTest.php @@ -143,5 +143,26 @@ public function testPut_exclusive() $err = Qiniu_RS_Delete($this->client, $this->bucket, $key); $this->assertNull($err); } + public function testPut_transform() { + $key = 'testPut_transform' . getTid(); + $scope = $this->bucket . ':' . $key; + $err = Qiniu_RS_Delete($this->client, $this->bucket, $key); + + $putPolicy = new Qiniu_RS_PutPolicy($scope); + $putPolicy->Transform = "imageMogr2/format/png"; + $putPolicy->ReturnBody = '{"key": $(key), "hash": $(etag), "mimeType":$(mimeType)}'; + $upToken = $putPolicy->Token(null); + + list($ret, $err) = Qiniu_PutFile($upToken, $key, __file__, null); + $this->assertNull($ret); + $this->assertEquals($err->Err, "fop fail or timeout"); + var_dump($err); + + $pic_path = "../docs/gist/logo.jpg"; + list($ret, $err) = Qiniu_PutFile($upToken, $key, $pic_path, null); + $this->assertNull($err); + $this->assertEquals($ret["mimeType"], "image/png"); + var_dump($ret); + } } From 93d81de4b2c05c4c79e9f9001078d3e8dc118913 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Mon, 17 Feb 2014 12:00:30 +0800 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 628a55c8..d56deb6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## CHANGE LOG +### v6.1.6 + +2014-2-17 issues [#62](https://github.com/qiniu/php-sdk/pull/62) + +- 上传策略[支持transform/fopTimeout字段](http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html#put-policy-transform) + + ### v6.1.5 2014-2-13 issues [#59](https://github.com/qiniu/php-sdk/pull/59) From 4acdcfc1729643d5c7a8d530d4d75fae78dfe9b3 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Mon, 17 Feb 2014 12:01:07 +0800 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d56deb6d..fb32f672 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 2014-2-17 issues [#62](https://github.com/qiniu/php-sdk/pull/62) -- 上传策略[支持transform/fopTimeout字段](http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html#put-policy-transform) +- 上传策略[支持transform/fopTimeout字段](http://developer.qiniu.com/docs/v6/api/reference/security/put-policy.html#put-policy-transform)，用于支持对上传内容做一次同步的数据处理，并将结果作为最终资源保存 ### v6.1.5