Merge pull request #10 from qiniu/develop

xushiwei · xushiwei · commit 5ee383361575 · 2013-07-02T23:26:57.000-07:00
Release v6.0.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,16 @@
 ## CHANGE LOG
 
+### v6.0.1
+
+2013-07-03 issue [#10](https://github.com/qiniu/api/pull/10)
+
+- new Qiniu_RS_GetPolicy($expires = 0);
+- new Qiniu_RS_PutPolicy($scope, $expires = 0);
+
+
 ### v6.0.0
 
-2013-06-29 issue [#9](https://github.com/qiniu/api/pull/9)
+2013-07-02 issue [#9](https://github.com/qiniu/api/pull/9)
 
 - 遵循 [sdkspec v6.0.2](https://github.com/qiniu/sdkspec/tree/v6.0.2)
   - `Qiniu_Put/PutFile` 调整为基于 up.qiniu.com 的协议，extra *PutExtra 参数可以为 nil
diff --git a/qiniu/rs.php b/qiniu/rs.php
@@ -9,6 +9,11 @@ class Qiniu_RS_GetPolicy
 {
 	public $Expires;
 
+	public function __construct($expires = 0)
+	{
+		$this->Expires = $expires;
+	}
+
 	public function MakeRequest($baseUrl, $mac) // => $privateUrl
 	{
 		$deadline = $this->Expires;
@@ -50,9 +55,10 @@ class Qiniu_RS_PutPolicy
 	public $EndUser;
 	public $Expires;
 
-	public function __construct($scope)
+	public function __construct($scope, $expires = 0)
 	{
 		$this->Scope = $scope;
+		$this->Expires = $expires;
 	}
 
 	public function Token($mac) // => $token

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,11 @@ class Qiniu_RS_GetPolicy`
`9`	`9`	`{`
`10`	`10`	`public $Expires;`
`11`	`11`
	`12`	`+ public function __construct($expires = 0)`
	`13`	`+ {`
	`14`	`+ $this->Expires = $expires;`
	`15`	`+ }`
	`16`	`+`
`12`	`17`	`public function MakeRequest($baseUrl, $mac) // => $privateUrl`
`13`	`18`	`{`
`14`	`19`	`$deadline = $this->Expires;`
`@@ -50,9 +55,10 @@ class Qiniu_RS_PutPolicy`
`50`	`55`	`public $EndUser;`
`51`	`56`	`public $Expires;`
`52`	`57`
`53`		`- public function __construct($scope)`
	`58`	`+ public function __construct($scope, $expires = 0)`
`54`	`59`	`{`
`55`	`60`	`$this->Scope = $scope;`
	`61`	`+ $this->Expires = $expires;`
`56`	`62`	`}`
`57`	`63`
`58`	`64`	`public function Token($mac) // => $token`