Merge pull request #84 from qiniu/develop

Release 6.1.11
qiniu · Jul 11, 2014 · c4c5834 · c4c5834
2 parents 4c2327a + 6d58067
commit c4c5834
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/qiniu/conf.php b/qiniu/conf.php
@@ -10,7 +10,7 @@
 
 $SDK_VER = "6.1.9";
 
-$QINIU_UP_HOST	= 'http://up.qiniu.com';
+$QINIU_UP_HOST	= 'http://upload.qiniu.com';
 $QINIU_RS_HOST	= 'http://rs.qbox.me';
 $QINIU_RSF_HOST	= 'http://rsf.qbox.me';
 

diff --git a/qiniu/rs.php b/qiniu/rs.php
@@ -54,6 +54,7 @@ class Qiniu_RS_PutPolicy
 	public $FsizeLimit;
 	public $SaveKey;
 	public $PersistentOps;
+	public $PersistentPipeline;
 	public $PersistentNotifyUrl;
 	public $FopTimeout;
 	public $MimeLimit;
@@ -105,6 +106,9 @@ public function Token($mac) // => $token
 		if (!empty($this->PersistentOps)) {
 			$policy['persistentOps'] = $this->PersistentOps;
 		}
+		if (!empty($this->PersistentPipeline)) {
+			$policy['persistentPipeline'] = $this->PersistentPipeline;
+		}
 		if (!empty($this->PersistentNotifyUrl)) {
 			$policy['persistentNotifyUrl'] = $this->PersistentNotifyUrl;
 		}