test do not merge

Author: dtynn

qiniu/resumable_io.php

@@ -12,7 +12,7 @@ class Qiniu_Rio_PutExtra
 	public $Params = null;
 	public $MimeType = null;
 	public $ChunkSize = 0;		// 可选。每次上传的Chunk大小
-	public $TryTimes = 0;		// 可选。尝试次数
+	public $TryTimes = 3;		// 可选。尝试次数
 	public $Progresses = null;	// 可选。上传进度：[]BlkputRet
 	public $Notify = null;		// 进度通知：func(blkIdx int, blkSize int, ret *BlkputRet)
 	public $NotifyErr = null;	// 错误通知：func(blkIdx int, blkSize int, err error)
@@ -118,13 +118,24 @@ function Qiniu_Rio_Put($upToken, $key, $body, $fsize, $putExtra) // => ($putRet,
 	$progresses = array();
 	$uploaded = 0;
 	while ($uploaded < $fsize) {
+		$tried = 0;
+		$tryTimes = ($putExtra->TryTimes > 0) ? $putExtra->TryTimes : 1;
 		if ($fsize < $uploaded + QINIU_RIO_BLOCK_SIZE) {
 			$bsize = $fsize - $uploaded;
 		} else {
 			$bsize = QINIU_RIO_BLOCK_SIZE;
 		}
-		list($blkputRet, $err) = Qiniu_Rio_Mkblock($self, $QINIU_UP_HOST, $body, $bsize);
-		$host = $blkputRet['host'];
+		while ($tried < $tryTimes) {
+			list($blkputRet, $err) = Qiniu_Rio_Mkblock($self, $QINIU_UP_HOST, $body, $bsize);
+			if ($err === null) {
+				break;
+			}
+			$tried += 1;
+			continue;
+		}
+		if ($err !== null) {
+			return array(null, $err);
+		}
 		$uploaded += $bsize;
 		$progresses []= $blkputRet;
 	}