Merge pull request #41 from dtynn/wanglin/up-resumable

Wanglin/up resumable

Author: longshanksmo

qiniu/resumable_io.php

@@ -59,11 +59,13 @@ function Qiniu_Rio_Mkblock($self, $host, $reader, $size) // => ($blkputRet, $err
 	return Qiniu_Client_CallWithForm($self, $url, $body, 'application/octet-stream');
 }
 
+
 function Qiniu_Rio_Mkfile($self, $host, $key, $fsize, $extra) // => ($putRet, $err)
 {
-	$entry = $extra->Bucket . ':' . $key;
-	$url = $host . '/rs-mkfile/' . Qiniu_Encode($entry) . '/fsize/' . $fsize;
-
+	$url = $host . '/mkfile/' . $fsize;
+	if ($key !== null) {
+		$url .= '/key/' . Qiniu_Encode($key);
+	}
 	if (!empty($extra->MimeType)) {
 		$url .= '/mimeType/' . Qiniu_Encode($extra->MimeType);
 	}
@@ -74,7 +76,7 @@ function Qiniu_Rio_Mkfile($self, $host, $key, $fsize, $extra) // => ($putRet, $e
 	}
 	$body = implode(',', $ctxs);
 
-	return Qiniu_Client_CallWithForm($self, $url, $body, 'text/plain');
+	return Qiniu_Client_CallWithForm($self, $url, $body, 'application/octet-stream');
 }
 
 // ----------------------------------------------------------
@@ -107,22 +109,21 @@ function Qiniu_Rio_Put($upToken, $key, $body, $fsize, $putExtra) // => ($putRet,
 	$self = new Qiniu_Rio_UploadClient($upToken);
 
 	$progresses = array();
-	$host = $QINIU_UP_HOST;
 	$uploaded = 0;
 	while ($uploaded < $fsize) {
 		if ($fsize < $uploaded + QINIU_RIO_BLOCK_SIZE) {
 			$bsize = $fsize - $uploaded;
 		} else {
 			$bsize = QINIU_RIO_BLOCK_SIZE;
 		}
-		list($blkputRet, $err) = Qiniu_Rio_Mkblock($self, $host, $body, $bsize);
+		list($blkputRet, $err) = Qiniu_Rio_Mkblock($self, $QINIU_UP_HOST, $body, $bsize);
 		$host = $blkputRet['host'];
 		$uploaded += $bsize;
 		$progresses []= $blkputRet;
 	}
 
 	$putExtra->Progresses = $progresses;
-	return Qiniu_Rio_Mkfile($self, $host, $key, $fsize, $putExtra);
+	return Qiniu_Rio_Mkfile($self, $QINIU_UP_HOST, $key, $fsize, $putExtra);
 }
 
 function Qiniu_Rio_PutFile($upToken, $key, $localFile, $putExtra) // => ($putRet, $err)