From d6ccbb90c6d4fb44cfa749ef1716dab36152b295 Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Mon, 8 Jul 2013 10:13:44 +0800
Subject: [PATCH 01/23] gist doc

---
 docs/README.md     | 575 ++++++++++++++++++++++++++++++---------------
 docs/gist/demo.php | 198 ++++++++++++++--
 docs/gist/f22.jpeg | Bin 0 -> 5420 bytes
 3 files changed, 557 insertions(+), 216 deletions(-)
 create mode 100644 docs/gist/f22.jpeg

diff --git a/docs/README.md b/docs/README.md
index a6cab71b..25ae90bb 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -16,10 +16,16 @@ SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
 	- [2 复制单个文件](#rs-copy)
 	- [3 移动单个文件](#rs-move)
 	- [4 删除单个文件](#rs-delete)
+	- [5 批量操作](#batch)
+		- [5.1 批量获取文件信息](#batch_stat)
+		- [5.2 批量复制文件](#batch_copy)
+		- [5.3 批量删除文件](#batch_delete)
+		- [5.4 批量移动文件](#batch_move)				
 - [上传下载接口](#get-and-put-api)
 	- [1 文件上传](#upload)
 		- [1.1 上传流程](#io-put-flow)
 		- [1.2 上传策略](#io-put-policy)
+		- [1.3 断点续上传](#rio-putfile)		
 	- [2 文件下载](#io-download)
 		- [2.1 公有资源下载](#public-download)
 		- [2.2 私有资源下载](#private-download)
@@ -53,95 +59,227 @@ SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
 
 示例代码如下：
 
-	require_once("qiniu/rs.php");
+```
+{php}
 
-	$bucket = "phpsdk";
-	$key = "pic.jpg";
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
+require_once("../../qiniu/rs.php");
 	
-	Qiniu_SetKeys($accessKey, $secretKey);
-	$client = new Qiniu_MacHttpClient(null);
-
-	list($ret, $err) = Qiniu_RS_Stat($client, $bucket, $key);
-	echo "Qiniu_RS_Stat result: \n";
-	if ($err !== null) {
-		var_dump($err);
-	} else {
-		var_dump($ret);
-	}
+$bucket = 'phpsdk';
+$key = 'pic';
 	
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$client = new Qiniu_MacHttpClient(null);
+list($ret, $err) = Qiniu_RS_Stat($client, $bucket, $key);
+echo "\n\n====> Qiniu_RS_Stat result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+```	
 <a name="rs-copy"></a>
 ### 2. 复制单个文件
 
 示例代码如下：
 
-	require_once("qiniu/rs.php");
+```
+{php}
 
-	$bucket = "phpsdk";
-	$key = "pic.jpg";
-	$key1 = "file_name1";
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
+require_once("../../qiniu/rs.php");
 	
-	Qiniu_SetKeys($accessKey, $secretKey);
-	$client = new Qiniu_MacHttpClient(null);
+$bucket = 'phpsdk';
+$key = 'pic';
+$key2 = 'file_name';
 	
-	$err = Qiniu_RS_Copy($client, $bucket, $key, $bucket, $key1);
-	echo "====> Qiniu_RS_Copy result: \n";
-	if ($err !== null) {
-		var_dump($err);
-	} else {
-		echo "Success!";
-	}
-
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$err = Qiniu_RS_Copy($client, $bucket, $key, $bucket, $key2);
+echo "\n\n====> Qiniu_RS_Copy result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	echo "Success! \n";
+}
+```	
 <a name=rs-move></a>
 ### 3. 移动单个文件
 
 示例代码如下：
 
-	require_once("qiniu/rs.php");
+```
+{php}	
 
-	$bucket = "phpsdk";
-	$key = "pic.jpg";
-	$key1 = "file_name1";
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
-	
-	Qiniu_SetKeys($accessKey, $secretKey);
-	$client = new Qiniu_MacHttpClient(null);
-	
-	$err = Qiniu_RS_Move($client, $bucket, $key, $bucket, $key1);
-	echo "====> Qiniu_RS_Move result: \n";
-	if ($err !== null) {
-		var_dump($err);
-	} else {
-		echo "Success!";
-	}
+require_once("../../qiniu/rs.php");
 	
+$bucket = 'phpsdk';
+$key = 'pic';
+$key2 = 'file_name';
+
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$client = new Qiniu_MacHttpClient(null);
+$err = Qiniu_RS_Move($client, $bucket, $key2, $bucket, $key);
+echo "\n\n====> Qiniu_RS_Move result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	echo "Success! \n";
+}
+```	
 <a name=rs-delete></a>
 ### 4. 删除单个文件
 
 示例代码如下：
 
-	require_once("qiniu/rs.php");
+```
+{php}
 	
-	$bucket = "phpsdk";
-	$key1 = "file_name1";
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
+require_once("../../qiniu/rs.php");
 	
-	Qiniu_SetKeys($accessKey, $secretKey);
-	$client = new Qiniu_MacHttpClient(null);
+$bucket = 'phpsdk';
+$key = 'pic';
 	
-	$err = Qiniu_RS_Delete($client, $bucket, $key1);
-	echo "====> Qiniu_RS_Delete result: \n";
-	if ($err !== null) {
-		var_dump($err);
-	} else {
-		echo "Success!";
-	}
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$client = new Qiniu_MacHttpClient(null);
+$err = Qiniu_RS_Delete($client, $bucket, $key);
+echo "\n\n====> Qiniu_RS_Delete result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	echo "Success! \n";
+}
+```	
+<a name=batch></a>
+### 5.批量操作
+当您需要一次性进行多个操作时，可以使用批量操作。
+<a name=batch_stat></a>
+#### 5.1 批量获取文件属性信息
+示例代码如下：
 
+```
+{php}
+	
+require_once("../../qiniu/rs.php");
+
+$bucket = 'phpsdk';
+$key = 'pic';
+$key2 = 'file_name';
+	
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$e1 = new Qiniu_RS_EntryPath($bucket, $key);
+$e2 = new Qiniu_RS_EntryPath($bucket, $key2);
+$client = new Qiniu_MacHttpClient(null);
+$entries = array($e1, $e2);
+list($ret, $err) = Qiniu_RS_BatchStat($client, $entries);
+echo "\n\n====> Qiniu_RS_BatchStat result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+```	
+<a name=batch_copy></a>
+#### 5.2 批量复制文件
+示例代码如下：
+
+```
+{php}
+	
+require_once("../../qiniu/rs.php");
+
+$bucket = 'phpsdk';
+$key = 'pic';
+$key2 = 'file_name';
+	
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$e1 = new Qiniu_RS_EntryPath($bucket, $key);
+$e2 = new Qiniu_RS_EntryPath($bucket, $key2);
+$key3 = $key . '3';
+$e3 = new Qiniu_RS_EntryPath($bucket, $key3);
+$client = new Qiniu_MacHttpClient(null);
+$entryPairs = array(new Qiniu_RS_EntryPathPair($e1, $e2), new Qiniu_RS_EntryPathPair($e1, $e3));
+list($ret, $err) = Qiniu_RS_BatchCopy($client, $entryPairs);
+echo "\n\n====> Qiniu_RS_BatchCopy result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+```
+<a name=batch_delete></a>
+#### 5.3 批量删除文件
+示例代码如下：
+
+```
+{php}
+	
+require_once("../../qiniu/rs.php");
+
+$bucket = 'phpsdk';
+$key = 'pic';
+$key2 = 'file_name';
+	
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$e1 = new Qiniu_RS_EntryPath($bucket, $key);
+$e2 = new Qiniu_RS_EntryPath($bucket, $key2);
+$client = new Qiniu_MacHttpClient(null);
+$entries = array($e1, $e2);
+list($ret, $err) = Qiniu_RS_BatchDelete($client, $entries);
+echo "\n\n====> Qiniu_RS_BatchDelete result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+```
+<a name=batch_move></a>
+#### 5.4 批量移动文件
+示例代码如下：
+
+```
+{php}
+	
+require_once("../../qiniu/rs.php");
+
+$bucket = 'phpsdk';
+$key = 'pic';
+	
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$e1 = new Qiniu_RS_EntryPath($bucket, $key);
+$key3 = $key . '3';
+$e3 = new Qiniu_RS_EntryPath($bucket, $key3);
+$client = new Qiniu_MacHttpClient(null);
+$entryPairs = array(new Qiniu_RS_EntryPathPair($e3, $e1));
+list($ret, $err) = Qiniu_RS_BatchMove($client, $entryPairs);
+echo "\n\n====> Qiniu_RS_BatchMove result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+```
 <a name="get-and-put-api"></a>
 ## 上传下载接口
 	
@@ -175,67 +313,76 @@ SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
 2. 凭借 [uptoken](http://docs.qiniu.com/api/put.html#uploadToken) 上传文件到七牛
 3. 善后工作，比如保存相关的一些信息
 
-服务端生成 [uptoken](http://docs.qiniu.com/api/put.html#uploadToken) 代码如下：
+服务端生成 [uptoken](http://docs.qiniu.com/api/put.html#uploadToken) 代码如下:
 
+```
+{php}	
 
-	require_once("qiniu/rs.php");
-	
-	$bucket = 'phpsdk';
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
-	
-	Qiniu_SetKeys($accessKey, $secretKey);
-	$putPolicy = new Qiniu_RS_PutPolicy($bucket);
-	$upToken = $putPolicy->Token(null);
-	
+require_once("../../qiniu/rs.php");
+
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+$putPolicy = new Qiniu_RS_PutPolicy($bucket);
+$upToken = $putPolicy->Token(null);
+```	 
 上传文件到七牛（通常是客户端完成，但也可以发生在服务端）：
 
 
 上传字符串
 
-	require_once("qiniu/io.php");
-	require_once("qiniu/rs.php");
-	
-	$bucket = "phpsdk";
-	$key1 = "file_name1";
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
+```
+{php}
 	
-	Qiniu_SetKeys($accessKey, $secretKey);
-	$putPolicy = new Qiniu_RS_PutPolicy($bucket);
-	$upToken = $putPolicy->Token(null);
-	list($ret, $err) = Qiniu_Put($upToken, $key1, "Qiniu Storage!", null);
-	echo "====> Qiniu_Put result: \n";
-	if ($err !== null) {
-		var_dump($err);
-	} else {
-		var_dump($ret);
-	}
+require_once("../../qiniu/rs.php");
+require_once("../../qiniu/io.php");
+
+$bucket = 'phpsdk';
+$key = 'pic';
+
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$putPolicy = new Qiniu_RS_PutPolicy($bucket);
+$upToken = $putPolicy->Token(null);
+list($ret, $err) = Qiniu_Put($upToken, $key, "Qiniu Storage!", null);
+echo "\n\n====> Qiniu_Put result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+```	 
 
 上传本地文件
 
-	require_once("qiniu/io.php");
-	require_once("qiniu/rs.php");
-	
-	$bucket = "phpsdk";
-	$key1 = "file_name1";
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
+```
+{php}
 	
-	Qiniu_SetKeys($accessKey, $secretKey);
-	$putPolicy = new Qiniu_RS_PutPolicy($bucket);
-	$upToken = $putPolicy->Token(null);
-	$putExtra = new Qiniu_PutExtra();
-	$putExtra->Crc32 = 1;
-	list($ret, $err) = Qiniu_PutFile($upToken, $key1, __file__, $putExtra);
-	echo "====> Qiniu_PutFile result: \n";
-	if ($err !== null) {
-		var_dump($err);
-	} else {
-		var_dump($ret);
-	}
-
-
+require_once("../../qiniu/rs.php");
+require_once("../../qiniu/io.php");
+
+$bucket = 'phpsdk';
+$key = 'pic';
+$file = 'f22.jpeg';
+
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$putPolicy = new Qiniu_RS_PutPolicy($bucket);
+$upToken = $putPolicy->Token(null);
+$putExtra = new Qiniu_PutExtra();
+$putExtra->Crc32 = 1;
+list($ret, $err) = Qiniu_PutFile($upToken, $key, $file, $putExtra);
+echo "\n\n====> Qiniu_PutFile result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+```	
 <a name="io-put-policy"></a>
 ### 1.2 上传策略
 
@@ -262,6 +409,35 @@ SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
 
 关于上传策略更完整的说明，请参考 [uptoken](http://docs.qiniu.com/api/put.html#uploadToken)。
 
+<a name="rio-putfile"></a>
+### 1.3 断点续上传
+示例代码如下
+
+```
+{php}
+	
+require_once("../../qiniu/rs.php");
+require_once("../../qiniu/resumable_io.php");
+
+$bucket = 'phpsdk';
+$key = 'pic';
+$file = 'f22.jpeg';
+
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$putPolicy = new Qiniu_RS_PutPolicy($bucket);
+$upToken = $putPolicy->Token(null);
+$putExtra = new Qiniu_Rio_PutExtra($bucket);
+list($ret, $err) = Qiniu_Rio_PutFile($upToken, $key, $file, $putExtra);
+echo "\n\n====> Qiniu_Rio_PutFile result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+```	
 
 <a name=io-download></a>
 ### 2. 文件下载
@@ -279,11 +455,14 @@ SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
 	
 示例代码：
 
-	$key = 'pic.jpg';
-	$domain = 'phpsdk.qiniudn.com';
-	//$baseUrl 就是您要访问资源的地址
-	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
-
+```
+{php}
+	
+$key = 'pic';
+$domain = 'phpsdk.qiniudn.com';
+//$baseUrl 就是您要访问资源的地址:
+$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+```	
 其中<domain>可以到[七牛云存储开发者自助网站](https://portal.qiniu.com/)绑定, 域名可以使用自己一级域名的或者是由七牛提供的二级域名(`<bucket>.qiniudn.com`)。注意，尖括号不是必需，代表替换项。
 
 <a name=private-download></a>
@@ -295,20 +474,24 @@ SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
 注意，尖括号不是必需，代表替换项。  
 私有下载链接可以使用 SDK 提供的如下方法生成：
 
-	require_once("qiniu/rs.php");
+```
+{php}
 
-	$key = 'pic.jpg';
-	$domain = 'phpsdk.qiniudn.com';
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
+require_once("../../qiniu/rs.php");
+	
+$key = 'pic';
+$domain = 'phpsdk.qiniudn.com';
 	
-	Qiniu_SetKeys($accessKey, $secretKey);	
-	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
-	$getPolicy = new Qiniu_RS_GetPolicy();
-	$privateUrl = $getPolicy->MakeRequest($baseUrl);
-	echo "====> getPolicy result: \n";
-	echo $privateUrl . "\n";
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
 
+$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+$getPolicy = new Qiniu_RS_GetPolicy();
+$privateUrl = $getPolicy->MakeRequest($baseUrl, null);
+echo "\n\n====> getPolicy result: \n";
+echo $privateUrl . "\n";
+```	
 
 <a name=fop-api></a>
 ## 数据处理接口
@@ -319,85 +502,94 @@ SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
 <a name=fop-image-info></a>
 #### 1.1 查看图像属性
 
-	require_once("qiniu/rs.php");
-	require_once("qiniu/fop.php");
+```
+{php}
+	
+require_once("../../qiniu/rs.php");
+require_once("../../qiniu/fop.php");
 
-	$key = 'pic.jpg';
-	$domain = 'phpsdk.qiniudn.com';
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
+$key = 'pic';
+$domain = 'phpsdk.qiniudn.com';
 	
-	Qiniu_SetKeys($accessKey, $secretKey);	
-	//生成baseUrl
-	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
-
-	//生成fopUrl
- 	$imgInfo = new Qiniu_ImageInfo;
- 	$imgInfoUrl = $imgInfo->MakeRequest($baseUrl);
- 	
- 	//对fopUrl 进行签名，生成privateUrl。 公有bucket 此步可以省去。
- 	$getPolicy = new Qiniu_RS_GetPolicy();
- 	$imgInfoPrivateUrl = $getPolicy->MakeRequest($imgInfoUrl, null);
-	echo "====> imageInfo privateUrl: \n";
-	echo $imgInfoPrivateUrl . "\n";
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+$getPolicy = new Qiniu_RS_GetPolicy();
+$imgInfo = new Qiniu_ImageInfo;
+
+//生成fopUrl
+$imgInfoUrl = $imgInfo->MakeRequest($baseUrl);
+
+//对fopUrl 进行签名，生成privateUrl。 公有bucket 此步可以省去。
+$imgInfoPrivateUrl = $getPolicy->MakeRequest($imgInfoUrl, null);
+echo "\n\n====> imageInfo privateUrl: \n";
+echo $imgInfoPrivateUrl . "\n";
+```
 
 将`$imgInfoPrivateUrl`粘贴到浏览器地址栏中就可以查看该图像的信息了。
 
 <a name=fop-exif></a>
 #### 1.2 查看图片EXIF信息
 
+```
+{php}
 
-	require_once("qiniu/rs.php");
-	require_once("qiniu/fop.php");
+require_once("../../qiniu/rs.php");
+require_once("../../qiniu/fop.php");
 
-	$key = 'pic.jpg';
-	$domain = 'phpsdk.qiniudn.com';
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
-	
-	Qiniu_SetKeys($accessKey, $secretKey);	
-	//生成baseUrl
-	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
-	
-	//生成fopUrl
-	$imgExif = new Qiniu_Exif;
- 	$imgExifUrl = $imgExif->MakeRequest($baseUrl);
- 	
- 	//对fopUrl 进行签名，生成privateUrl。 公有bucket 此步可以省去。
- 	$getPolicy = new Qiniu_RS_GetPolicy();
- 	$imgExifPrivateUrl = $getPolicy->MakeRequest($imgExifUrl, null);
-	echo "====> imageView privateUrl: \n";
-	echo $imgExifPrivateUrl . "\n";
+$key = 'pic';
+$domain = 'phpsdk.qiniudn.com';
+
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+$getPolicy = new Qiniu_RS_GetPolicy();
+$imgExif = new Qiniu_Exif;
+
+//生成fopUrl
+$imgExifUrl = $imgExif->MakeRequest($baseUrl);
+//对fopUrl 进行签名，生成privateUrl。 公有bucket 此步可以省去。
+$imgExifPrivateUrl = $getPolicy->MakeRequest($imgExifUrl, null);
+echo "\n\n====> imageView privateUrl: \n";
+echo $imgExifPrivateUrl . "\n";
+```
 	
 <a name=fop-image-view></a>
 #### 1.3 生成图片预览
 
-	require_once("qiniu/rs.php");
-	require_once("qiniu/fop.php");
+```
+{php}
+
+require_once("../../qiniu/rs.php");
+require_once("../../qiniu/fop.php");
+
+$key = 'pic';
+$domain = 'phpsdk.qiniudn.com';
+
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+
+$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+$getPolicy = new Qiniu_RS_GetPolicy();
+$imgView = new Qiniu_ImageView;
+$imgView->Mode = 1;
+$imgView->Width = 60;
+$imgView->Height = 30;
+
+//生成fopUrl
+$imgViewUrl = $imgView->MakeRequest($baseUrl);
+
+//对fopUrl 进行签名，生成privateUrl。 公有bucket 此步可以省去。
+$imgViewPrivateUrl = $getPolicy->MakeRequest($imgViewUrl, null);
+echo "\n\n====> imageView privateUrl: \n";
+echo $imgViewPrivateUrl . "\n";
+```
 
-	$key = 'pic.jpg';
-	$domain = 'phpsdk.qiniudn.com';
-	$accessKey = '<YOUR_APP_ACCESS_KEY>';
-	$secretKey = '<YOUR_APP_SECRET_KEY>';
-	
-	Qiniu_SetKeys($accessKey, $secretKey);	
-	//生成baseUrl
-	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
-	
-	//生成fopUrl
- 	$imgView = new Qiniu_ImageView;
- 	$imgView->Mode = 1;
- 	$imgView->Width = 60;
- 	$imgView->Height = 120;
- 	$imgViewUrl = $imgView->MakeRequest($baseUrl);
- 	
- 	//对fopUrl 进行签名，生成privateUrl。 公有bucket 此步可以省去。
- 	$getPolicy = new Qiniu_RS_GetPolicy();
- 	$imgViewPrivateUrl = $getPolicy->MakeRequest($imgViewUrl, null);
-	echo "====> imageView privateUrl: \n";
-	echo $imgViewPrivateUrl . "\n";
-	
-	
 <a name=contribution></a>
 ## 贡献代码
 
@@ -417,3 +609,4 @@ Copyright (c) 2013 qiniu.com
 
 * [www.opensource.org/licenses/MIT](http://www.opensource.org/licenses/MIT)
 
+
diff --git a/docs/gist/demo.php b/docs/gist/demo.php
index 9c130305..e55e77b2 100644
--- a/docs/gist/demo.php
+++ b/docs/gist/demo.php
@@ -1,23 +1,102 @@
 <?php
 
+# @gist require_io
 require_once("../../qiniu/io.php");
+# @endgist
+# @gist require_rs
 require_once("../../qiniu/rs.php");
+# @endgist
+# @gist require_fop
 require_once("../../qiniu/fop.php");
-
+# @endgist
+# @gist require_rsf
+require_once("../../qiniu/rsf.php");
+# @endgist
+# @gist require_rio
+require_once("../../qiniu/resumable_io.php");
+# @endgist
+# @gist bucket
 $bucket = 'phpsdk';
-$key = 'pic.jpg';
-$key1 = 'file_name1';
+# @endgist
+# @gist key
+$key = 'pic';
+# @endgist
+# @gist key2
+$key2 = 'file_name';
+# @endgist
+# @gist file
+$file = 'f22.jpeg';
+# @endgist
+# @gist domain
 $domain = 'phpsdk.qiniudn.com';
+# @endgist
 
-$accessKey = 'Vhiv6a22kVN_zhtetbPNeG9sY3JUL1HG597EmBwQ';
-$secretKey = 'b5b5vNg5nnkwkPfW5ayicPE_pj6hqgKMQEaWQ6JD';
+# @gist set_keys
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
-
+# @endgist
+# @gist mac_client
 $client = new Qiniu_MacHttpClient(null);
+# @endgist
 
+Qiniu_RS_Delete($client, $bucket, $key);
+Qiniu_RS_Delete($client, $bucket, $key2);
+
+//------------------------------------io-----------------------------------------
+# @gist putpolicy
+$putPolicy = new Qiniu_RS_PutPolicy($bucket);
+$upToken = $putPolicy->Token(null);
+# @endgist
+
+# @gist put
+list($ret, $err) = Qiniu_Put($upToken, $key, "Qiniu Storage!", null);
+echo "\n\n====> Qiniu_Put result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+# @endgist
+Qiniu_RS_Delete($client, $bucket, $key);
+
+# @gist putfile
+$putExtra = new Qiniu_PutExtra();
+$putExtra->Crc32 = 1;
+list($ret, $err) = Qiniu_PutFile($upToken, $key, $file, $putExtra);
+echo "\n\n====> Qiniu_PutFile result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+# @endgist
+Qiniu_RS_Delete($client, $bucket, $key);
+
+# @gist getpolicy
+$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+$getPolicy = new Qiniu_RS_GetPolicy();
+$privateUrl = $getPolicy->MakeRequest($baseUrl, null);
+echo "\n\n====> getPolicy result: \n";
+echo $privateUrl . "\n";
+# @endgist
 
-//------------------------------------rs-----------------------------------------
 
+//------------------------------------rio-----------------------------------------
+//Qiniu_Rio_PutFile($upToken, $key, $localFile, $putExtra) // => ($putRet, $err)
+# @gist rio_putfile
+$putExtra = new Qiniu_Rio_PutExtra($bucket);
+list($ret, $err) = Qiniu_Rio_PutFile($upToken, $key, $file, $putExtra);
+echo "\n\n====> Qiniu_Rio_PutFile result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+# @endgist
+
+//------------------------------------rs-----------------------------------------
+# @gist stat
 list($ret, $err) = Qiniu_RS_Stat($client, $bucket, $key);
 echo "\n\n====> Qiniu_RS_Stat result: \n";
 if ($err !== null) {
@@ -25,15 +104,19 @@
 } else {
 	var_dump($ret);
 }
+# @endgist
 
-$err = Qiniu_RS_Copy($client, $bucket, $key, $bucket, $key1);
+# @gist copy
+$err = Qiniu_RS_Copy($client, $bucket, $key, $bucket, $key2);
 echo "\n\n====> Qiniu_RS_Copy result: \n";
 if ($err !== null) {
 	var_dump($err);
 } else {
 	echo "Success! \n";
 }
+# @endgist
 
+# @gist delete
 $err = Qiniu_RS_Delete($client, $bucket, $key);
 echo "\n\n====> Qiniu_RS_Delete result: \n";
 if ($err !== null) {
@@ -41,68 +124,133 @@
 } else {
 	echo "Success! \n";
 }
+# @endgist
 
-$err = Qiniu_RS_Move($client, $bucket, $key1, $bucket, $key);
+# @gist move
+$err = Qiniu_RS_Move($client, $bucket, $key2, $bucket, $key);
 echo "\n\n====> Qiniu_RS_Move result: \n";
 if ($err !== null) {
 	var_dump($err);
 } else {
 	echo "Success! \n";
 }
+# @endgist
 
+# @gist entrypath1
+$e1 = new Qiniu_RS_EntryPath($bucket, $key);
+# @endgist
+# @gist entrypath2
+$e2 = new Qiniu_RS_EntryPath($bucket, $key2);
+# @endgist
+# @gist entrypath3
+$key3 = $key . '3';
+$e3 = new Qiniu_RS_EntryPath($bucket, $key3);
+# @endgist
 
-//------------------------------------io-----------------------------------------
+# @gist batch_stat
+$entries = array($e1, $e2);
+list($ret, $err) = Qiniu_RS_BatchStat($client, $entries);
+echo "\n\n====> Qiniu_RS_BatchStat result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+# @endgist
 
-$putPolicy = new Qiniu_RS_PutPolicy($bucket);
-$upToken = $putPolicy->Token(null);
-list($ret, $err) = Qiniu_Put($upToken, $key1, "Qiniu Storage!", null);
-echo "\n\n====> Qiniu_Put result: \n";
+# @gist batch_copy
+$entryPairs = array(new Qiniu_RS_EntryPathPair($e1, $e2), new Qiniu_RS_EntryPathPair($e1, $e3));
+list($ret, $err) = Qiniu_RS_BatchCopy($client, $entryPairs);
+echo "\n\n====> Qiniu_RS_BatchCopy result: \n";
 if ($err !== null) {
 	var_dump($err);
 } else {
 	var_dump($ret);
 }
-Qiniu_RS_Delete($client, $bucket, $key1);
+# @endgist
 
-$putExtra = new Qiniu_PutExtra();
-$putExtra->Crc32 = 1;
-list($ret, $err) = Qiniu_PutFile($upToken, $key1, __file__, null);
-echo "\n\n====> Qiniu_PutFile result: \n";
+# @gist batch_delete
+$entries = array($e1, $e2);
+list($ret, $err) = Qiniu_RS_BatchDelete($client, $entries);
+echo "\n\n====> Qiniu_RS_BatchDelete result: \n";
 if ($err !== null) {
 	var_dump($err);
 } else {
 	var_dump($ret);
 }
-Qiniu_RS_Delete($client, $bucket, $key1);
+# @endgist
 
-$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
-$getPolicy = new Qiniu_RS_GetPolicy();
-$privateUrl = $getPolicy->MakeRequest($baseUrl, null);
-echo "\n\n====> getPolicy result: \n";
-echo $privateUrl . "\n";
+# @gist batch_move
+$entryPairs = array(new Qiniu_RS_EntryPathPair($e3, $e1));
+list($ret, $err) = Qiniu_RS_BatchMove($client, $entryPairs);
+echo "\n\n====> Qiniu_RS_BatchMove result: \n";
+if ($err !== null) {
+	var_dump($err);
+} else {
+	var_dump($ret);
+}
+# @endgist
+
+
+//------------------------------------rsf-----------------------------------------
+
+list($iterms, $markerOut, $err) = Qiniu_RSF_ListPrefix($client, $bucket);
+echo "\n\n====> Qiniu_RSF result: \n";
+if ($err != null) {
+	if ($err === Qiniu_RSF_EOF) {
+		var_dump($iterms);
+	} else {
+		var_dump(err);
+	}
+} else {
+	var_dump($iterms);
+}
 
 
 //------------------------------------fop-----------------------------------------
+# @gist base_url
+$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+# @endgist
 
+# @gist image_info
+$getPolicy = new Qiniu_RS_GetPolicy();
 $imgInfo = new Qiniu_ImageInfo;
+
+//生成fopUrl
 $imgInfoUrl = $imgInfo->MakeRequest($baseUrl);
+
+//对fopUrl 进行签名，生成privateUrl。 公有bucket 此步可以省去。
 $imgInfoPrivateUrl = $getPolicy->MakeRequest($imgInfoUrl, null);
 echo "\n\n====> imageInfo privateUrl: \n";
 echo $imgInfoPrivateUrl . "\n";
+# @endgist
 
+# @gist image_exif
+$getPolicy = new Qiniu_RS_GetPolicy();
 $imgExif = new Qiniu_Exif;
+
+//生成fopUrl
 $imgExifUrl = $imgExif->MakeRequest($baseUrl);
+//对fopUrl 进行签名，生成privateUrl。 公有bucket 此步可以省去。
 $imgExifPrivateUrl = $getPolicy->MakeRequest($imgExifUrl, null);
 echo "\n\n====> imageView privateUrl: \n";
 echo $imgExifPrivateUrl . "\n";
+# @endgist
 
+# @gist image_view
+$getPolicy = new Qiniu_RS_GetPolicy();
 $imgView = new Qiniu_ImageView;
 $imgView->Mode = 1;
 $imgView->Width = 60;
 $imgView->Height = 30;
+
+//生成fopUrl
 $imgViewUrl = $imgView->MakeRequest($baseUrl);
+
+//对fopUrl 进行签名，生成privateUrl。 公有bucket 此步可以省去。
 $imgViewPrivateUrl = $getPolicy->MakeRequest($imgViewUrl, null);
 echo "\n\n====> imageView privateUrl: \n";
 echo $imgViewPrivateUrl . "\n";
+# @endgist
 
 
diff --git a/docs/gist/f22.jpeg b/docs/gist/f22.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..9983575598f1e9583f1a9b8452df201f8c94ae73
GIT binary patch
literal 5420
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

literal 0
HcmV?d00001


From 97e4cbe4dce3882a0ef7d07446f65a9e3ec55082 Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Tue, 8 Apr 2014 11:22:21 +0800
Subject: [PATCH 02/23] add gist tool to phpsdk

---
 docs/gist.py | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100755 docs/gist.py

diff --git a/docs/gist.py b/docs/gist.py
new file mode 100755
index 00000000..a09520aa
--- /dev/null
+++ b/docs/gist.py
@@ -0,0 +1,138 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+import re
+
+re_md_gist = re.compile(r"@gist\(([^\)]+)\)")
+re_strip = re.compile(r"^\n*(.*)\n\t*$", re.S)
+re_indent = re.compile(r"^(\t*)[^\t\s\n\r]")
+line_start = r"(?:^|\n)\s*"
+re_gist_comment = dict(
+	c = dict(
+		start = re.compile(r"%s\/\*\s*@gist\s+([\w\-_]+)\s*\*/.*?\n+" % line_start),
+		end = re.compile(r"%s\/\*\s*@endgist\s*\*/" % line_start),
+	),
+	bash = dict(
+		start = re.compile(r"%s#\s*@gist\s+([\w\-_]+).*?\n+" % line_start),
+		end = re.compile(r"%s#\s*@endgist" % line_start),
+	),
+	cpp = dict(
+		start = re.compile(r"%s//\s*@gist\s+([\w\-_]+).*?\n+" % line_start),
+		end = re.compile(r"%s//\s*@endgist" % line_start)
+	),
+	html = dict(
+		start = re.compile(r"%s<!-- @gist\s+([\w\-_]+?) -->.*?\n+" % line_start),
+		end = re.compile(r"%s<!-- @endgist -->" % line_start),
+	),
+)
+cpath = sys.path[0]
+
+def openfile(path):
+	if not os.path.exists(path):
+		return None
+	f = open(path, "r")
+	body = f.read()
+	f.close()
+	return body
+
+def get_gist_block(path):
+	gists = dict()
+	body = openfile(path)
+	if body is None:
+		return gists
+	start = 0
+	while True:
+		a = search_one_block(body[start:])
+		if a is None:
+			break
+		name, content, new_start = a
+		start += new_start
+		if not name in gists:
+			gists[name] = content
+		else:
+			gists[name].extend(["", "...", ""])
+			gists[name].extend(content)
+	gists[""] = body.split("\n")
+	return gists
+
+def search_one_block(body):
+	if len(body) == 0:
+		return None
+	for n, regs in re_gist_comment.iteritems():
+		a = regs["start"].search(body)
+		if a is None:
+			continue
+		start = a.span()[1]
+		b = regs["end"].search(body[start:])
+		if b is None:
+			continue
+		break
+	if a is None or b is None:
+		return None
+
+	body = body[start: b.span()[0]+start]
+	body = re_strip.sub("\\1", body)
+	start_indent = len(re_indent.findall(body)[0])
+	body = [i[start_indent:] for i in body.split("\n")]
+	return a.group(1), body, b.span()[1] + start
+
+def dirname(path):
+	name = os.path.dirname(path)
+	if name == "":
+		name = "."
+	return name
+
+if __name__ == "__main__":
+	if len(sys.argv) <= 1:
+		sys.stderr.write("Usage: %s GistFile > OutputFile\n" % os.path.basename(sys.argv[0]))
+		exit(2)
+
+	body = openfile(sys.argv[1])
+	if body is None:
+		sys.stderr.write("Not such File.")
+		exit(2)
+
+	rpath = dirname(sys.argv[1])
+	body_gist_ref = []
+	ref_files = []
+	for i in re_md_gist.findall(body):
+		file_path = i
+		if i.find("#") > 0:
+			file_path = file_path.split("#")[0]
+		ref_files.append("%s/%s" % (rpath, file_path))
+		body_gist_ref.append(i)
+	ref_files = list(set(ref_files))
+
+	match_gists = {}
+	for f in ref_files:
+		blocks = get_gist_block(f)
+		for block_key in blocks:
+			key = "%s#%s" % (f, block_key)
+			if len(block_key) == 0:
+				key = "%s%s" % (f, block_key)
+			match_gists[key] = blocks[block_key]
+
+	errors = []
+	for i in body_gist_ref:
+		key = "%s/%s" % (rpath, i)
+		if key in match_gists:
+			match_results = re_md_gist.search(body)
+			if match_results is None:
+				continue
+			s = match_results.span()[0]
+			s = body[body[s-50: s].rfind("\n")+s-50+1: s]
+			content = (("\n%s" % s).join(match_gists[key])).strip()
+			content = content.replace("\\", "\\\\")
+
+			body = re.sub(r"@gist\s*\(%s\)" % i, content, body)
+		else:
+			errors.append(i)
+
+	if len(errors) > 0:
+		sys.stderr.write("error: No Such File or Anchor\n")
+		for i, error in enumerate(errors):
+			sys.stderr.write("%s: '%s'\n" % (i+1, error))
+		exit(2)
+	print body

From b17f40269de19a624b4520636ffe2bf7f943f808 Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Tue, 8 Apr 2014 11:22:44 +0800
Subject: [PATCH 03/23] add README.gist.md

---
 docs/README.gist.md | 482 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 482 insertions(+)
 create mode 100644 docs/README.gist.md

diff --git a/docs/README.gist.md b/docs/README.gist.md
new file mode 100644
index 00000000..befa75f7
--- /dev/null
+++ b/docs/README.gist.md
@@ -0,0 +1,482 @@
+---
+title: PHP SDK
+---
+
+# PHP SDK 使用指南
+
+此 SDK 适用于 PHP 5.1.0 及其以上版本。基于 [七牛云存储官方API](http://docs.qiniu.com) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
+
+SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
+
+
+- [应用接入](#install)
+	- [获取Access Key 和 Secret Key](#acc-appkey)
+- [资源管理接口](#rs-api)
+	- [1 查看单个文件属性信息](#rs-stat)
+	- [2 复制单个文件](#rs-copy)
+	- [3 移动单个文件](#rs-move)
+	- [4 删除单个文件](#rs-delete)
+	- [5 批量操作](#batch)
+		- [5.1 批量获取文件信息](#batch_stat)
+		- [5.2 批量复制文件](#batch_copy)
+		- [5.3 批量删除文件](#batch_delete)
+		- [5.4 批量移动文件](#batch_move)
+- [上传下载接口](#get-and-put-api)
+	- [1 文件上传](#upload)
+		- [1.1 上传流程](#io-put-flow)
+		- [1.2 上传策略](#io-put-policy)
+		- [1.3 断点续上传](#rio-putfile)
+	- [2 文件下载](#io-download)
+		- [2.1 公有资源下载](#public-download)
+		- [2.2 私有资源下载](#private-download)
+- [数据处理接口](#fop-api)
+	- [1 图像](#fop-image)
+		- [1.1 查看图像属性](#fop-image-info)
+		- [1.2 查看图片EXIF信息](#fop-exif)
+		- [1.3 生成图片预览](#fop-image-view)
+- [贡献代码](#contribution)
+- [许可证](#license)
+
+
+
+<a name=install></a>
+## 应用接入
+
+<a name="acc-appkey"></a>
+
+### 1. 获取Access Key 和 Secret Key
+
+要接入七牛云存储，您需要拥有一对有效的 Access Key 和 Secret Key 用来进行签名认证。可以通过如下步骤获得：
+
+1. [开通七牛开发者帐号](https://portal.qiniu.com/signup)
+2. [登录七牛开发者自助平台，查看 Access Key 和 Secret Key](https://portal.qiniu.com/setting/key) 。
+
+<a name=rs-api></a>
+## 资源管理接口
+
+<a name="rs-stat"></a>
+### 1.查看单个文件属性信息
+
+示例代码如下：
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#mac_client)
+@gist(gist/demo.php#stat)
+```
+<a name="rs-copy"></a>
+### 2. 复制单个文件
+
+示例代码如下：
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#key2)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#mac_client)
+@gist(gist/demo.php#copy)
+```
+<a name=rs-move></a>
+### 3. 移动单个文件
+
+示例代码如下：
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#key2)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#mac_client)
+@gist(gist/demo.php#move)
+```
+<a name=rs-delete></a>
+### 4. 删除单个文件
+
+示例代码如下：
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#mac_client)
+@gist(gist/demo.php#delete)
+```
+<a name=batch></a>
+### 5.批量操作
+当您需要一次性进行多个操作时，可以使用批量操作。
+<a name=batch_stat></a>
+#### 5.1 批量获取文件属性信息
+示例代码如下：
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#key2)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#entrypath1)
+@gist(gist/demo.php#entrypath2)
+@gist(gist/demo.php#mac_client)
+@gist(gist/demo.php#batch_stat)
+```
+<a name=batch_copy></a>
+#### 5.2 批量复制文件
+示例代码如下：
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#key2)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#entrypath1)
+@gist(gist/demo.php#entrypath2)
+@gist(gist/demo.php#entrypath3)
+@gist(gist/demo.php#mac_client)
+@gist(gist/demo.php#batch_copy)
+```
+<a name=batch_delete></a>
+#### 5.3 批量删除文件
+示例代码如下：
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#key2)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#entrypath1)
+@gist(gist/demo.php#entrypath2)
+@gist(gist/demo.php#mac_client)
+@gist(gist/demo.php#batch_delete)
+
+```
+<a name=batch_move></a>
+#### 5.4 批量移动文件
+示例代码如下：
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#entrypath1)
+@gist(gist/demo.php#entrypath3)
+@gist(gist/demo.php#mac_client)
+@gist(gist/demo.php#batch_move)
+
+```
+<a name="get-and-put-api"></a>
+## 上传下载接口
+
+<a name=upload></a>
+### 1. 文件上传
+
+为了尽可能地改善终端用户的上传体验，七牛云存储首创了客户端直传功能。一般云存储的上传流程是：
+
+    客户端（终端用户） => 业务服务器 => 云存储服务
+
+这样多了一次上传的流程，和本地存储相比，会相对慢一些。但七牛引入了客户端直传，将整个上传过程调整为：
+
+    客户端（终端用户） => 七牛 => 业务服务器
+
+客户端（终端用户）直接上传到七牛的服务器，通过DNS智能解析，七牛会选择到离终端用户最近的ISP服务商节点，速度会比本地存储快很多。文件上传成功以后，七牛的服务器使用回调功能，只需要将非常少的数据（比如Key）传给应用服务器，应用服务器进行保存即可。
+
+<a name="io-put-flow"></a>
+#### 1.1上传流程
+
+在七牛云存储中，整个上传流程大体分为这样几步：
+
+1. 业务服务器颁发 [uptoken（上传授权凭证）](http://docs.qiniu.com/api/put.html#uploadToken)给客户端（终端用户）
+2. 客户端凭借 [uptoken](http://docs.qiniu.com/api/put.html#uploadToken) 上传文件到七牛
+3. 在七牛获得完整数据后，发起一个 HTTP 请求回调到业务服务器
+4. 业务服务器保存相关信息，并返回一些信息给七牛
+5. 七牛原封不动地将这些信息转发给客户端（终端用户）
+
+需要注意的是，回调到业务服务器的过程是可选的，它取决于业务服务器颁发的 [uptoken](http://docs.qiniu.com/api/put.html#uploadToken)。如果没有回调，七牛会返回一些标准的信息（比如文件的 hash）给客户端。如果上传发生在业务服务器，以上流程可以自然简化为：
+
+1. 业务服务器生成 uptoken（不设置回调，自己回调到自己这里没有意义）
+2. 凭借 [uptoken](http://docs.qiniu.com/api/put.html#uploadToken) 上传文件到七牛
+3. 善后工作，比如保存相关的一些信息
+
+服务端生成 [uptoken](http://docs.qiniu.com/api/put.html#uploadToken) 代码如下:
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+
+@gist(gist/demo.php#set_keys)
+@gist(gist/demo.php#putpolicy)
+
+```
+上传文件到七牛（通常是客户端完成，但也可以发生在服务端）：
+
+
+上传字符串
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+@gist(gist/demo.php#require_io)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#putpolicy)
+@gist(gist/demo.php#put)
+```
+
+上传本地文件
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+@gist(gist/demo.php#require_io)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#file)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#putpolicy)
+@gist(gist/demo.php#putfile)
+```
+<a name="io-put-policy"></a>
+### 1.2 上传策略
+
+[uptoken](http://docs.qiniu.com/api/put.html#uploadToken) 实际上是用 AccessKey/SecretKey 进行数字签名的上传策略(`Qiniu_RS_PutPolicy`)，它控制则整个上传流程的行为。让我们快速过一遍你都能够决策啥：
+
+	class Qiniu_RS_PutPolicy
+	{
+		public $Scope;				// 必选项。可以是 bucketName 或者 bucketName:key
+		public $CallbackUrl;		// 可选
+		public $CallbackBody;		// 可选
+		public $ReturnUrl;			// 可选， 更贴切的名字是 redirectUrl。
+		public $ReturnBody;			// 可选
+		public $AsyncOps;			// 可选
+		public $EndUser;			// 可选
+		public $Expires;			// 可选。默认是 3600 秒
+		public $PersistentOps;		// 可选。
+		public $PersistentNotifyUrl;	// 如果设置了PersistentOps，必须同时设置此项。
+		public $InsertOnly;		// 可选。如果设置为非0值，则无论scope设置为何种形式，都只能以`新增`方式上传，不能覆盖。
+		public $DetectMime;		// 可选。如果设为非0值，则忽略上传端传递的文件MimeType信息，使用七牛服务器侦测内容后的判断结果。
+		public $FsizeLimit;		// 可选。int类型，超过限制大小的上传内容会被判为上传失败，返回413状态码。
+		public $SaveKey;			// 可选。自定义资源名格式。
+		public $Transform;			// 可选。指定资源经过怎样的处理后再保存。
+		public $FopTimeout;		// 可选。int类型，指定transform的超时时间，如果文件处理超过此值，则认为上传失败。
+		public $MimeLimit;			// 可选。限定上传的文件类型。
+	}
+
+* `scope` 限定客户端的权限。如果 `scope` 是 bucket，则客户端只能新增文件到指定的 bucket，不能修改文件。如果 `scope` 为 bucket:key，则客户端可以修改指定的文件。**注意： key必须采用utf8编码，如使用非utf8编码访问七牛云存储将反馈错误**
+* `callbackUrl` 设定业务服务器的回调地址，这样业务服务器才能感知到上传行为的发生。
+* `callbackBody` 设定业务服务器的回调信息。文件上传成功后，七牛向业务服务器的callbackUrl发送的POST请求携带的数据。支持 [魔法变量](http://docs.qiniu.com/api/put.html#MagicVariables) 和 [自定义变量](http://docs.qiniu.com/api/put.html#xVariables)。
+* `returnUrl` 设置用于浏览器端文件上传成功后，浏览器执行301跳转的URL，一般为 HTML Form 上传时使用。文件上传成功后浏览器会自动跳转到 `returnUrl?upload_ret=returnBody`。
+* `returnBody` 可调整返回给客户端的数据包，支持 [魔法变量](http://docs.qiniu.com/api/put.html#MagicVariables) 和 [自定义变量](http://docs.qiniu.com/api/put.html#xVariables)。`returnBody` 只在没有 `callbackUrl` 时有效（否则直接返回 `callbackUrl` 返回的结果）。不同情形下默认返回的 `returnBody` 并不相同。在一般情况下返回的是文件内容的 `hash`，也就是下载该文件时的 `etag`；但指定 `returnUrl` 时默认的 `returnBody` 会带上更多的信息。
+* `asyncOps` 可指定上传完成后，需要自动执行哪些数据处理。这是因为有些数据处理操作（比如音视频转码）比较慢，如果不进行预转可能第一次访问的时候效果不理想，预转可以很大程度改善这一点。
+* `persistentOps` 可指定音视频文件上传完成后，需要进行的转码持久化操作。asyncOps的处理结果保存在缓存当中，有可能失效。而persistentOps的处理结果以文件形式保存在bucket中，体验更佳。[数据处理(持久化)](http://docs.qiniu.com/api/persistent-ops.html)
+* `persistentNotifyUrl` 音视频转码持久化完成后，七牛的服务器会向用户发送处理结果通知。这里指定的url就是用于接收通知的接口。设置了`persistentOps`,则需要同时设置此字段。
+
+关于上传策略更完整的说明，请参考 [uptoken](http://docs.qiniu.com/api/put.html#uploadToken)。
+
+<a name="rio-putfile"></a>
+### 1.3 断点续上传
+示例代码如下
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+@gist(gist/demo.php#require_io)
+
+@gist(gist/demo.php#bucket)
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#file)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#putpolicy)
+@gist(gist/demo.php#rio_putfile)
+```
+
+<a name=io-download></a>
+### 2. 文件下载
+七牛云存储上的资源下载分为 公有资源下载 和 私有资源下载 。
+
+私有（private）是 Bucket（空间）的一个属性，一个私有 Bucket 中的资源为私有资源，私有资源不可匿名下载。
+
+新创建的空间（Bucket）缺省为私有，也可以将某个 Bucket 设为公有，公有 Bucket 中的资源为公有资源，公有资源可以匿名下载。
+
+<a name=public-download></a>
+#### 2.1 公有资源下载
+如果在给bucket绑定了域名的话，可以通过以下地址访问。
+
+	[GET] http://<domain>/<key>
+
+示例代码：
+
+	@gist(gist/demo.php#key1)
+	@gist(gist/demo.php#domain)
+	@gist(gist/demo.php#base_url)
+
+其中\<domain\>是bucket所对应的域名。七牛云存储为每一个bucket提供一个默认域名。默认域名可以到[七牛云存储开发者平台](https://portal.qiniu.com/)中，空间设置的域名设置一节查询。用户也可以将自有的域名绑定到bucket上，通过自有域名访问七牛云存储。
+
+**注意： key必须采用utf8编码，如使用非utf8编码访问七牛云存储将反馈错误**
+
+<a name=private-download></a>
+#### 2.2 私有资源下载
+私有资源必须通过临时下载授权凭证(downloadToken)下载，如下：
+
+	[GET] http://<domain>/<key>?e=<deadline>&token=<downloadToken>
+
+注意，尖括号不是必需，代表替换项。
+私有下载链接可以使用 SDK 提供的如下方法生成：
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#domain)
+
+@gist(gist/demo.php#set_keys)
+@gist(gist/demo.php#base_url)
+@gist(gist/demo.php#getpolicy)
+
+```
+
+<a name=fop-api></a>
+## 数据处理接口
+七牛支持在云端对图像, 视频, 音频等富媒体进行个性化处理
+
+<a name=fop-image></a>
+### 1. 图像
+<a name=fop-image-info></a>
+#### 1.1 查看图像属性
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+@gist(gist/demo.php#require_fop)
+
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#domain)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#base_url)
+@gist(gist/demo.php#image_info)
+```
+
+将`$imgInfoPrivateUrl`粘贴到浏览器地址栏中就可以查看该图像的信息了。
+
+<a name=fop-exif></a>
+#### 1.2 查看图片EXIF信息
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+@gist(gist/demo.php#require_fop)
+
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#domain)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#base_url)
+@gist(gist/demo.php#image_exif)
+```
+
+<a name=fop-image-view></a>
+#### 1.3 生成图片预览
+
+```
+{php}
+
+@gist(gist/demo.php#require_rs)
+@gist(gist/demo.php#require_fop)
+
+@gist(gist/demo.php#key1)
+@gist(gist/demo.php#domain)
+
+@gist(gist/demo.php#set_keys)
+
+@gist(gist/demo.php#base_url)
+@gist(gist/demo.php#image_view)
+```
+
+<a name=contribution></a>
+## 贡献代码
+
+1. Fork
+2. 创建您的特性分支 (`git checkout -b my-new-feature`)
+3. 提交您的改动 (`git commit -am 'Added some feature'`)
+4. 将您的修改记录提交到远程 `git` 仓库 (`git push origin my-new-feature`)
+5. 然后到 github 网站的该 `git` 远程仓库的 `my-new-feature` 分支下发起 Pull Request
+
+
+<a name=license></a>
+## 许可证
+
+Copyright (c) 2013 qiniu.com
+
+基于 MIT 协议发布:
+
+* [www.opensource.org/licenses/MIT](http://www.opensource.org/licenses/MIT)
+
+

From 85446b6c9486c8077d41d80ef68f9e37f50058c6 Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Tue, 8 Apr 2014 11:25:40 +0800
Subject: [PATCH 04/23] modify demo.php to achieve elegent code block in doc

---
 docs/gist/demo.php | 52 +++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/docs/gist/demo.php b/docs/gist/demo.php
index e55e77b2..01edfd58 100644
--- a/docs/gist/demo.php
+++ b/docs/gist/demo.php
@@ -1,31 +1,32 @@
 <?php
 
+chdir('../..');
 # @gist require_io
-require_once("../../qiniu/io.php");
+require_once('qiniu/io.php');
 # @endgist
 # @gist require_rs
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 # @endgist
 # @gist require_fop
-require_once("../../qiniu/fop.php");
+require_once('qiniu/fop.php');
 # @endgist
 # @gist require_rsf
-require_once("../../qiniu/rsf.php");
+require_once('qiniu/rsf.php');
 # @endgist
 # @gist require_rio
-require_once("../../qiniu/resumable_io.php");
+require_once('qiniu/resumable_io.php');
 # @endgist
 # @gist bucket
 $bucket = 'phpsdk';
 # @endgist
-# @gist key
-$key = 'pic';
+# @gist key1
+$key1 = 'file_name_1';
 # @endgist
 # @gist key2
-$key2 = 'file_name';
+$key2 = 'file_name_2';
 # @endgist
 # @gist file
-$file = 'f22.jpeg';
+$file = 'docs/gist/f22.jpeg';
 # @endgist
 # @gist domain
 $domain = 'phpsdk.qiniudn.com';
@@ -34,13 +35,15 @@
 # @gist set_keys
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
+$accessKey = 'Vhiv6a22kVN_zhtetbPNeG9sY3JUL1HG597EmBwQ';
+$secretKey = 'b5b5vNg5nnkwkPfW5ayicPE_pj6hqgKMQEaWQ6JD';
 Qiniu_setKeys($accessKey, $secretKey);
 # @endgist
 # @gist mac_client
 $client = new Qiniu_MacHttpClient(null);
 # @endgist
 
-Qiniu_RS_Delete($client, $bucket, $key);
+Qiniu_RS_Delete($client, $bucket, $key1);
 Qiniu_RS_Delete($client, $bucket, $key2);
 
 //------------------------------------io-----------------------------------------
@@ -50,7 +53,7 @@
 # @endgist
 
 # @gist put
-list($ret, $err) = Qiniu_Put($upToken, $key, "Qiniu Storage!", null);
+list($ret, $err) = Qiniu_Put($upToken, $key1, 'Qiniu Storage!', null);
 echo "\n\n====> Qiniu_Put result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -58,12 +61,12 @@
 	var_dump($ret);
 }
 # @endgist
-Qiniu_RS_Delete($client, $bucket, $key);
+Qiniu_RS_Delete($client, $bucket, $key1);
 
 # @gist putfile
 $putExtra = new Qiniu_PutExtra();
 $putExtra->Crc32 = 1;
-list($ret, $err) = Qiniu_PutFile($upToken, $key, $file, $putExtra);
+list($ret, $err) = Qiniu_PutFile($upToken, $key1, $file, $putExtra);
 echo "\n\n====> Qiniu_PutFile result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -71,10 +74,10 @@
 	var_dump($ret);
 }
 # @endgist
-Qiniu_RS_Delete($client, $bucket, $key);
+Qiniu_RS_Delete($client, $bucket, $key1);
 
 # @gist getpolicy
-$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key1);
 $getPolicy = new Qiniu_RS_GetPolicy();
 $privateUrl = $getPolicy->MakeRequest($baseUrl, null);
 echo "\n\n====> getPolicy result: \n";
@@ -83,10 +86,10 @@
 
 
 //------------------------------------rio-----------------------------------------
-//Qiniu_Rio_PutFile($upToken, $key, $localFile, $putExtra) // => ($putRet, $err)
+//Qiniu_Rio_PutFile($upToken, $key1, $localFile, $putExtra) // => ($putRet, $err)
 # @gist rio_putfile
 $putExtra = new Qiniu_Rio_PutExtra($bucket);
-list($ret, $err) = Qiniu_Rio_PutFile($upToken, $key, $file, $putExtra);
+list($ret, $err) = Qiniu_Rio_PutFile($upToken, $key1, $file, $putExtra);
 echo "\n\n====> Qiniu_Rio_PutFile result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -97,7 +100,7 @@
 
 //------------------------------------rs-----------------------------------------
 # @gist stat
-list($ret, $err) = Qiniu_RS_Stat($client, $bucket, $key);
+list($ret, $err) = Qiniu_RS_Stat($client, $bucket, $key1);
 echo "\n\n====> Qiniu_RS_Stat result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -107,7 +110,7 @@
 # @endgist
 
 # @gist copy
-$err = Qiniu_RS_Copy($client, $bucket, $key, $bucket, $key2);
+$err = Qiniu_RS_Copy($client, $bucket, $key1, $bucket, $key2);
 echo "\n\n====> Qiniu_RS_Copy result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -117,7 +120,7 @@
 # @endgist
 
 # @gist delete
-$err = Qiniu_RS_Delete($client, $bucket, $key);
+$err = Qiniu_RS_Delete($client, $bucket, $key1);
 echo "\n\n====> Qiniu_RS_Delete result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -127,7 +130,7 @@
 # @endgist
 
 # @gist move
-$err = Qiniu_RS_Move($client, $bucket, $key2, $bucket, $key);
+$err = Qiniu_RS_Move($client, $bucket, $key2, $bucket, $key1);
 echo "\n\n====> Qiniu_RS_Move result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -137,13 +140,13 @@
 # @endgist
 
 # @gist entrypath1
-$e1 = new Qiniu_RS_EntryPath($bucket, $key);
+$e1 = new Qiniu_RS_EntryPath($bucket, $key1);
 # @endgist
 # @gist entrypath2
 $e2 = new Qiniu_RS_EntryPath($bucket, $key2);
 # @endgist
 # @gist entrypath3
-$key3 = $key . '3';
+$key3 = $key1 . '3';
 $e3 = new Qiniu_RS_EntryPath($bucket, $key3);
 # @endgist
 
@@ -209,7 +212,8 @@
 
 //------------------------------------fop-----------------------------------------
 # @gist base_url
-$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+//$baseUrl 就是您要访问资源的地址
+$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key1);
 # @endgist
 
 # @gist image_info

From 010b119895e657665726684903120d3a10ef39ca Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Tue, 8 Apr 2014 14:10:42 +0800
Subject: [PATCH 05/23] user agent

---
 qiniu/conf.php |  3 +++
 qiniu/http.php | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/qiniu/conf.php b/qiniu/conf.php
index 254137a1..67ff068c 100644
--- a/qiniu/conf.php
+++ b/qiniu/conf.php
@@ -1,4 +1,5 @@
 <?php
+global $SDK_VER;
 
 global $QINIU_UP_HOST;
 global $QINIU_RS_HOST;
@@ -7,6 +8,8 @@
 global $QINIU_ACCESS_KEY;
 global $QINIU_SECRET_KEY;
 
+$SDK_VER = "6.1.9";
+
 $QINIU_UP_HOST	= 'http://up.qiniu.com';
 $QINIU_RS_HOST	= 'http://rs.qbox.me';
 $QINIU_RSF_HOST	= 'http://rsf.qbox.me';
diff --git a/qiniu/http.php b/qiniu/http.php
index ba890e55..7905d769 100644
--- a/qiniu/http.php
+++ b/qiniu/http.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once("auth_digest.php");
+require_once("conf.php");
 
 // --------------------------------------------------------------------------------
 // class Qiniu_Error
@@ -27,12 +28,14 @@ class Qiniu_Request
 	public $URL;
 	public $Header;
 	public $Body;
+	public $UA;
 
 	public function __construct($url, $body)
 	{
 		$this->URL = $url;
 		$this->Header = array();
 		$this->Body = $body;
+		$this->UA = Qiniu_UserAgent();
 	}
 }
 
@@ -111,6 +114,7 @@ function Qiniu_Client_do($req) // => ($resp, $error)
 	$ch = curl_init();
 	$url = $req->URL;
 	$options = array(
+		CURLOPT_USERAGENT => $req->UA,
 		CURLOPT_RETURNTRANSFER => true,
 		CURLOPT_SSL_VERIFYPEER => false,
 		CURLOPT_SSL_VERIFYHOST => false,
@@ -278,6 +282,21 @@ function Qiniu_Build_MultipartForm($fields, $files) // => ($contentType, $body)
 	return array($contentType, $body);
 }
 
+function Qiniu_UserAgent() {
+	global $SDK_VER;
+	$sdkInfo = "QiniuPHP/$SDK_VER";
+
+	$systemInfo = php_uname("s");
+	$machineInfo = php_uname("m");
+
+	$envInfo = "($systemInfo/$machineInfo)";
+
+	$phpVer = phpversion();
+
+	$ua = "$sdkInfo $envInfo PHP/$phpVer";
+	return $ua;
+}
+
 function Qiniu_escapeQuotes($str)
 {
 	$find = array("\\", "\"");

From ae99f4d7149c90646a0c35b0342acdd58556e9b6 Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Tue, 8 Apr 2014 14:31:05 +0800
Subject: [PATCH 06/23] changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4c7ff01..2f0fc814 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## CHANGE LOG
 
+### v6.1.9
+
+2014-4-8 issues [#69](https://github.com/qiniu/php-sdk/pull/69)
+
+- [#69] 增加User Agent以方便日志查询。
+
 ### v6.1.8
 
 2014-4-6 issues [#68](https://github.com/qiniu/php-sdk/pull/68)

From 6b421d079eed7c3b777df7af0805583fc3bec679 Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Tue, 8 Apr 2014 17:40:18 +0800
Subject: [PATCH 07/23] all case pass

---
 docs/README.gist.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/README.gist.md b/docs/README.gist.md
index befa75f7..5a2b15c7 100644
--- a/docs/README.gist.md
+++ b/docs/README.gist.md
@@ -254,6 +254,7 @@ SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
 @gist(gist/demo.php#require_rs)
 
 @gist(gist/demo.php#set_keys)
+@gist(gist/demo.php#bucket)
 @gist(gist/demo.php#putpolicy)
 
 ```
@@ -339,7 +340,7 @@ SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
 {php}
 
 @gist(gist/demo.php#require_rs)
-@gist(gist/demo.php#require_io)
+@gist(gist/demo.php#require_rio)
 
 @gist(gist/demo.php#bucket)
 @gist(gist/demo.php#key1)

From 5be44b0dbcee103a644faa1a934672b79f433945 Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Tue, 8 Apr 2014 17:59:42 +0800
Subject: [PATCH 08/23] rm f22.jpeg

---
 docs/gist/demo.php |   2 +-
 docs/gist/f22.jpeg | Bin 5420 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 docs/gist/f22.jpeg

diff --git a/docs/gist/demo.php b/docs/gist/demo.php
index 01edfd58..c6177c2f 100644
--- a/docs/gist/demo.php
+++ b/docs/gist/demo.php
@@ -26,7 +26,7 @@
 $key2 = 'file_name_2';
 # @endgist
 # @gist file
-$file = 'docs/gist/f22.jpeg';
+$file = 'docs/gist/logo.jpg';
 # @endgist
 # @gist domain
 $domain = 'phpsdk.qiniudn.com';
diff --git a/docs/gist/f22.jpeg b/docs/gist/f22.jpeg
deleted file mode 100644
index 9983575598f1e9583f1a9b8452df201f8c94ae73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5420
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


From 732d6568473e229bdcf72473d1ba20c8cee66e59 Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Tue, 8 Apr 2014 18:07:20 +0800
Subject: [PATCH 09/23] generate README.md by gist.py

---
 docs/README.md | 148 ++++++++++++++++++++++++++-----------------------
 1 file changed, 78 insertions(+), 70 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 9a11f3d8..e8292767 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -62,17 +62,17 @@ SDK源码地址：<https://github.com/qiniu/php-sdk/tags>
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
+$key1 = 'file_name_1';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
 $client = new Qiniu_MacHttpClient(null);
-list($ret, $err) = Qiniu_RS_Stat($client, $bucket, $key);
+list($ret, $err) = Qiniu_RS_Stat($client, $bucket, $key1);
 echo "\n\n====> Qiniu_RS_Stat result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -88,17 +88,18 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
-$key2 = 'file_name';
+$key1 = 'file_name_1';
+$key2 = 'file_name_2';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
-$err = Qiniu_RS_Copy($client, $bucket, $key, $bucket, $key2);
+$client = new Qiniu_MacHttpClient(null);
+$err = Qiniu_RS_Copy($client, $bucket, $key1, $bucket, $key2);
 echo "\n\n====> Qiniu_RS_Copy result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -114,18 +115,18 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
-$key2 = 'file_name';
+$key1 = 'file_name_1';
+$key2 = 'file_name_2';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
 $client = new Qiniu_MacHttpClient(null);
-$err = Qiniu_RS_Move($client, $bucket, $key2, $bucket, $key);
+$err = Qiniu_RS_Move($client, $bucket, $key2, $bucket, $key1);
 echo "\n\n====> Qiniu_RS_Move result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -141,17 +142,17 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
+$key1 = 'file_name_1';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
 $client = new Qiniu_MacHttpClient(null);
-$err = Qiniu_RS_Delete($client, $bucket, $key);
+$err = Qiniu_RS_Delete($client, $bucket, $key1);
 echo "\n\n====> Qiniu_RS_Delete result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -169,17 +170,17 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
-$key2 = 'file_name';
+$key1 = 'file_name_1';
+$key2 = 'file_name_2';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
-$e1 = new Qiniu_RS_EntryPath($bucket, $key);
+$e1 = new Qiniu_RS_EntryPath($bucket, $key1);
 $e2 = new Qiniu_RS_EntryPath($bucket, $key2);
 $client = new Qiniu_MacHttpClient(null);
 $entries = array($e1, $e2);
@@ -198,19 +199,19 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
-$key2 = 'file_name';
+$key1 = 'file_name_1';
+$key2 = 'file_name_2';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
-$e1 = new Qiniu_RS_EntryPath($bucket, $key);
+$e1 = new Qiniu_RS_EntryPath($bucket, $key1);
 $e2 = new Qiniu_RS_EntryPath($bucket, $key2);
-$key3 = $key . '3';
+$key3 = $key1 . '3';
 $e3 = new Qiniu_RS_EntryPath($bucket, $key3);
 $client = new Qiniu_MacHttpClient(null);
 $entryPairs = array(new Qiniu_RS_EntryPathPair($e1, $e2), new Qiniu_RS_EntryPathPair($e1, $e3));
@@ -229,17 +230,17 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
-$key2 = 'file_name';
+$key1 = 'file_name_1';
+$key2 = 'file_name_2';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
-$e1 = new Qiniu_RS_EntryPath($bucket, $key);
+$e1 = new Qiniu_RS_EntryPath($bucket, $key1);
 $e2 = new Qiniu_RS_EntryPath($bucket, $key2);
 $client = new Qiniu_MacHttpClient(null);
 $entries = array($e1, $e2);
@@ -250,6 +251,7 @@ if ($err !== null) {
 } else {
 	var_dump($ret);
 }
+
 ```
 <a name=batch_move></a>
 #### 5.4 批量移动文件
@@ -258,17 +260,17 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
+$key1 = 'file_name_1';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
-$e1 = new Qiniu_RS_EntryPath($bucket, $key);
-$key3 = $key . '3';
+$e1 = new Qiniu_RS_EntryPath($bucket, $key1);
+$key3 = $key1 . '3';
 $e3 = new Qiniu_RS_EntryPath($bucket, $key3);
 $client = new Qiniu_MacHttpClient(null);
 $entryPairs = array(new Qiniu_RS_EntryPathPair($e3, $e1));
@@ -279,6 +281,7 @@ if ($err !== null) {
 } else {
 	var_dump($ret);
 }
+
 ```
 <a name="get-and-put-api"></a>
 ## 上传下载接口
@@ -318,13 +321,15 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
+$bucket = 'phpsdk';
 $putPolicy = new Qiniu_RS_PutPolicy($bucket);
 $upToken = $putPolicy->Token(null);
+
 ```
 上传文件到七牛（通常是客户端完成，但也可以发生在服务端）：
 
@@ -334,11 +339,11 @@ $upToken = $putPolicy->Token(null);
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
-require_once("../../qiniu/io.php");
+require_once('qiniu/rs.php');
+require_once('qiniu/io.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
+$key1 = 'file_name_1';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
@@ -346,7 +351,7 @@ Qiniu_setKeys($accessKey, $secretKey);
 
 $putPolicy = new Qiniu_RS_PutPolicy($bucket);
 $upToken = $putPolicy->Token(null);
-list($ret, $err) = Qiniu_Put($upToken, $key, "Qiniu Storage!", null);
+list($ret, $err) = Qiniu_Put($upToken, $key1, 'Qiniu Storage!', null);
 echo "\n\n====> Qiniu_Put result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -360,12 +365,12 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
-require_once("../../qiniu/io.php");
+require_once('qiniu/rs.php');
+require_once('qiniu/io.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
-$file = 'f22.jpeg';
+$key1 = 'file_name_1';
+$file = 'docs/gist/logo.jpg';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
@@ -375,7 +380,7 @@ $putPolicy = new Qiniu_RS_PutPolicy($bucket);
 $upToken = $putPolicy->Token(null);
 $putExtra = new Qiniu_PutExtra();
 $putExtra->Crc32 = 1;
-list($ret, $err) = Qiniu_PutFile($upToken, $key, $file, $putExtra);
+list($ret, $err) = Qiniu_PutFile($upToken, $key1, $file, $putExtra);
 echo "\n\n====> Qiniu_PutFile result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -427,12 +432,12 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
-require_once("../../qiniu/resumable_io.php");
+require_once('qiniu/rs.php');
+require_once('qiniu/resumable_io.php');
 
 $bucket = 'phpsdk';
-$key = 'pic';
-$file = 'f22.jpeg';
+$key1 = 'file_name_1';
+$file = 'docs/gist/logo.jpg';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
@@ -441,7 +446,7 @@ Qiniu_setKeys($accessKey, $secretKey);
 $putPolicy = new Qiniu_RS_PutPolicy($bucket);
 $upToken = $putPolicy->Token(null);
 $putExtra = new Qiniu_Rio_PutExtra($bucket);
-list($ret, $err) = Qiniu_Rio_PutFile($upToken, $key, $file, $putExtra);
+list($ret, $err) = Qiniu_Rio_PutFile($upToken, $key1, $file, $putExtra);
 echo "\n\n====> Qiniu_Rio_PutFile result: \n";
 if ($err !== null) {
 	var_dump($err);
@@ -466,10 +471,10 @@ if ($err !== null) {
 
 示例代码：
 
-	$key = 'pic.jpg';
+	$key1 = 'file_name_1';
 	$domain = 'phpsdk.qiniudn.com';
 	//$baseUrl 就是您要访问资源的地址
-	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key1);
 
 其中\<domain\>是bucket所对应的域名。七牛云存储为每一个bucket提供一个默认域名。默认域名可以到[七牛云存储开发者平台](https://portal.qiniu.com/)中，空间设置的域名设置一节查询。用户也可以将自有的域名绑定到bucket上，通过自有域名访问七牛云存储。
 
@@ -487,23 +492,22 @@ if ($err !== null) {
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
+require_once('qiniu/rs.php');
 
-$key = 'pic';
+$key1 = 'file_name_1';
 $domain = 'phpsdk.qiniudn.com';
 
-Qiniu_SetKeys($accessKey, $secretKey);
-$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
-$getPolicy = new Qiniu_RS_GetPolicy();
-$privateUrl = $getPolicy->MakeRequest($baseUrl, null);
-echo "====> getPolicy result: \n";
-echo $privateUrl . "\n";
-
-$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+$accessKey = '<YOUR_ACCESS_KEY>';
+$secretKey = '<YOUR_SECRET_KEY>';
+Qiniu_setKeys($accessKey, $secretKey);
+//$baseUrl 就是您要访问资源的地址
+	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key1);
+$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key1);
 $getPolicy = new Qiniu_RS_GetPolicy();
 $privateUrl = $getPolicy->MakeRequest($baseUrl, null);
 echo "\n\n====> getPolicy result: \n";
 echo $privateUrl . "\n";
+
 ```
 
 <a name=fop-api></a>
@@ -518,17 +522,18 @@ echo $privateUrl . "\n";
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
-require_once("../../qiniu/fop.php");
+require_once('qiniu/rs.php');
+require_once('qiniu/fop.php');
 
-$key = 'pic';
+$key1 = 'file_name_1';
 $domain = 'phpsdk.qiniudn.com';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
-$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+//$baseUrl 就是您要访问资源的地址
+	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key1);
 $getPolicy = new Qiniu_RS_GetPolicy();
 $imgInfo = new Qiniu_ImageInfo;
 
@@ -549,17 +554,18 @@ echo $imgInfoPrivateUrl . "\n";
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
-require_once("../../qiniu/fop.php");
+require_once('qiniu/rs.php');
+require_once('qiniu/fop.php');
 
-$key = 'pic';
+$key1 = 'file_name_1';
 $domain = 'phpsdk.qiniudn.com';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
-$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+//$baseUrl 就是您要访问资源的地址
+	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key1);
 $getPolicy = new Qiniu_RS_GetPolicy();
 $imgExif = new Qiniu_Exif;
 
@@ -577,17 +583,18 @@ echo $imgExifPrivateUrl . "\n";
 ```
 {php}
 
-require_once("../../qiniu/rs.php");
-require_once("../../qiniu/fop.php");
+require_once('qiniu/rs.php');
+require_once('qiniu/fop.php');
 
-$key = 'pic';
+$key1 = 'file_name_1';
 $domain = 'phpsdk.qiniudn.com';
 
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
 Qiniu_setKeys($accessKey, $secretKey);
 
-$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key);
+//$baseUrl 就是您要访问资源的地址
+	$baseUrl = Qiniu_RS_MakeBaseUrl($domain, $key1);
 $getPolicy = new Qiniu_RS_GetPolicy();
 $imgView = new Qiniu_ImageView;
 $imgView->Mode = 1;
@@ -623,3 +630,4 @@ Copyright (c) 2013 qiniu.com
 * [www.opensource.org/licenses/MIT](http://www.opensource.org/licenses/MIT)
 
 
+

From 3b7e141130c47eb2cfb1bdb322dbffddda4d2f5d Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Wed, 9 Apr 2014 14:47:38 +0800
Subject: [PATCH 10/23] uinit test fix

---
 tests/IoTest.php | 2 +-
 tests/RsTest.php | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/IoTest.php b/tests/IoTest.php
index 305bbf2c..fea4fa46 100644
--- a/tests/IoTest.php
+++ b/tests/IoTest.php
@@ -91,7 +91,7 @@ public function testPut_mime_save()
 
 		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
 		$this->assertNull($err);
-		$this->assertEquals($ret['mimeType'], 'application/x-php');
+		$this->assertEquals($ret['mimeType'], 'application/x-httpd-php');
 		var_dump($ret);
 
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
diff --git a/tests/RsTest.php b/tests/RsTest.php
index a941a09e..2368198c 100644
--- a/tests/RsTest.php
+++ b/tests/RsTest.php
@@ -19,6 +19,11 @@ public function setUp()
 
 	public function testStat()
 	{
+		$putPolicy = new Qiniu_RS_PutPolicy($this->bucket . ":" . $this->key);
+		$upToken = $putPolicy->Token(null);
+		list($ret, $err) = Qiniu_PutFile($upToken, $this->key, __file__, null);
+		$this->assertNull($err);
+		Qiniu_RS_Delete($this->client, $this->bucket, $this->notExistKey);
 		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $this->key);
 		$this->assertArrayHasKey('hash', $ret);
 		$this->assertNull($err);

From 07548da0fba04c20760531c9b3f243ff765068d9 Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Wed, 9 Apr 2014 17:14:29 +0800
Subject: [PATCH 11/23] test do not merge

---
 qiniu/resumable_io.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qiniu/resumable_io.php b/qiniu/resumable_io.php
index 6314231f..ad8e3417 100644
--- a/qiniu/resumable_io.php
+++ b/qiniu/resumable_io.php
@@ -81,6 +81,7 @@ function Qiniu_Rio_Mkfile($self, $host, $key, $fsize, $extra) // => ($putRet, $e
 		$ctxs []= $prog['ctx'];
 	}
 	$body = implode(',', $ctxs);
+	var_dump($ctxs);
 
 	return Qiniu_Client_CallWithForm($self, $url, $body, 'application/octet-stream');
 }

From f2171fac4edefa165a7583d77aff175d9937fd79 Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Wed, 9 Apr 2014 17:56:10 +0800
Subject: [PATCH 12/23] test do not merge

---
 qiniu/resumable_io.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/qiniu/resumable_io.php b/qiniu/resumable_io.php
index ad8e3417..43449296 100644
--- a/qiniu/resumable_io.php
+++ b/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;
 	}

From ca2ef280bdb1d9c288dd2d74dcc197c451e6e472 Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Thu, 10 Apr 2014 11:28:56 +0800
Subject: [PATCH 13/23] =?UTF-8?q?=E5=88=A4=E6=96=ADtravis=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qiniu/resumable_io.php | 13 +++++++++----
 tests/RioTest.php      |  6 ++++++
 tests/RsUtilsTest.php  |  6 ++++++
 tests/bootstrap.php    | 12 ++++++++++--
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/qiniu/resumable_io.php b/qiniu/resumable_io.php
index 43449296..fa83c8c3 100644
--- a/qiniu/resumable_io.php
+++ b/qiniu/resumable_io.php
@@ -41,7 +41,7 @@ function Qiniu_Rio_Mkblock($self, $host, $reader, $size) // => ($blkputRet, $err
 	if (is_resource($reader)) {
 		$body = fread($reader, $size);
 		if ($body === false) {
-			$err = Qiniu_NewError(0, 'fread failed');
+			$err = new Qiniu_Error(0, 'fread failed');
 			return array(null, $err);
 		}
 	} else {
@@ -51,7 +51,7 @@ function Qiniu_Rio_Mkblock($self, $host, $reader, $size) // => ($blkputRet, $err
 		}
 	}
 	if (strlen($body) != $size) {
-		$err = Qiniu_NewError(0, 'fread failed: unexpected eof');
+		$err = new Qiniu_Error(0, 'fread failed: unexpected eof');
 		return array(null, $err);
 	}
 
@@ -81,7 +81,6 @@ function Qiniu_Rio_Mkfile($self, $host, $key, $fsize, $extra) // => ($putRet, $e
 		$ctxs []= $prog['ctx'];
 	}
 	$body = implode(',', $ctxs);
-	var_dump($ctxs);
 
 	return Qiniu_Client_CallWithForm($self, $url, $body, 'application/octet-stream');
 }
@@ -120,6 +119,8 @@ function Qiniu_Rio_Put($upToken, $key, $body, $fsize, $putExtra) // => ($putRet,
 	while ($uploaded < $fsize) {
 		$tried = 0;
 		$tryTimes = ($putExtra->TryTimes > 0) ? $putExtra->TryTimes : 1;
+		$blkputRet = null;
+		$err = null;
 		if ($fsize < $uploaded + QINIU_RIO_BLOCK_SIZE) {
 			$bsize = $fsize - $uploaded;
 		} else {
@@ -136,6 +137,10 @@ function Qiniu_Rio_Put($upToken, $key, $body, $fsize, $putExtra) // => ($putRet,
 		if ($err !== null) {
 			return array(null, $err);
 		}
+		if ($blkputRet === null ) {
+			$err = new Qiniu_Error(0, "rio: uploaded without ret");
+			return array(null, $err);
+		}
 		$uploaded += $bsize;
 		$progresses []= $blkputRet;
 	}
@@ -148,7 +153,7 @@ function Qiniu_Rio_PutFile($upToken, $key, $localFile, $putExtra) // => ($putRet
 {
 	$fp = fopen($localFile, 'rb');
 	if ($fp === false) {
-		$err = Qiniu_NewError(0, 'fopen failed');
+		$err = new Qiniu_Error(0, 'fopen failed');
 		return array(null, $err);
 	}
 
diff --git a/tests/RioTest.php b/tests/RioTest.php
index 28a44e1d..b6474bb5 100644
--- a/tests/RioTest.php
+++ b/tests/RioTest.php
@@ -26,6 +26,9 @@ public function testMockReader()
 
 	public function testPut()
 	{
+		if (getTestEnv() == "travis") {
+			return;
+		}
 		$key = 'testRioPut' . getTid();
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
@@ -50,6 +53,9 @@ public function testPut()
 
 	public function testLargePut()
 	{
+		if (getTestEnv() == "travis") {
+			return;
+		}
 		$key = 'testRioLargePut' . getTid();
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
diff --git a/tests/RsUtilsTest.php b/tests/RsUtilsTest.php
index 6b8123a5..75a8b7f5 100644
--- a/tests/RsUtilsTest.php
+++ b/tests/RsUtilsTest.php
@@ -16,6 +16,9 @@ public function setUp()
 
 	public function testRput()
 	{
+		if (getTestEnv() == "travis") {
+			return;
+		}
 		$key = 'tmp/testRput' . getTid();
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
@@ -35,6 +38,9 @@ public function testRput()
 
 	public function testRputFile()
 	{
+		if (getTestEnv() == "travis") {
+			return;
+		}
 		$key = 'tmp/testRputFile' . getTid();
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 014fc851..d555531d 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,10 +8,13 @@
 $secretKey = getenv("QINIU_SECRET_KEY");
 
 $tid = getenv("TRAVIS_JOB_NUMBER");
+
+$testEnv = getenv("QINIU_TEST_ENV");
+
 if (!empty($tid)) {
-    $pid = getmypid();
+	$pid = getmypid();
 	$tid = strstr($tid, ".");
-    $tid .= "." . $pid;
+	$tid .= "." . $pid;
 }
 
 function initKeys() {
@@ -26,6 +29,11 @@ function getTid() {
 	return $tid;
 }
 
+function getTestEnv() {
+	global $testEnv;
+	return $testEnv;
+}
+
 class MockReader
 {
 	private $off = 0;

From ed74540eda7d4f3a88c7b45f5de1626bd5ad1c6a Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Thu, 10 Apr 2014 11:35:31 +0800
Subject: [PATCH 14/23] travis env

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index b32c5893..399de88c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,6 @@ before_script:
   - export QINIU_SECRET_KEY="b5b5vNg5nnkwkPfW5ayicPE_pj6hqgKMQEaWQ6JD"
   - export QINIU_BUCKET_NAME="phpsdk"
   - export QINIU_KEY_NAME="file_name"
+  - export QINIU_TEST_ENV="travis"
 script:
   - cd tests; phpunit .

From 148a258de86c333d9f1e0617e82c921ab0a68323 Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Mon, 14 Apr 2014 15:24:36 +0800
Subject: [PATCH 15/23] fix iotest mimeType assert

---
 docs/gist/demo.php | 2 --
 tests/IoTest.php   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/gist/demo.php b/docs/gist/demo.php
index c6177c2f..b72e9e2d 100644
--- a/docs/gist/demo.php
+++ b/docs/gist/demo.php
@@ -35,8 +35,6 @@
 # @gist set_keys
 $accessKey = '<YOUR_ACCESS_KEY>';
 $secretKey = '<YOUR_SECRET_KEY>';
-$accessKey = 'Vhiv6a22kVN_zhtetbPNeG9sY3JUL1HG597EmBwQ';
-$secretKey = 'b5b5vNg5nnkwkPfW5ayicPE_pj6hqgKMQEaWQ6JD';
 Qiniu_setKeys($accessKey, $secretKey);
 # @endgist
 # @gist mac_client
diff --git a/tests/IoTest.php b/tests/IoTest.php
index 305bbf2c..fea4fa46 100644
--- a/tests/IoTest.php
+++ b/tests/IoTest.php
@@ -91,7 +91,7 @@ public function testPut_mime_save()
 
 		list($ret, $err) = Qiniu_RS_Stat($this->client, $this->bucket, $key);
 		$this->assertNull($err);
-		$this->assertEquals($ret['mimeType'], 'application/x-php');
+		$this->assertEquals($ret['mimeType'], 'application/x-httpd-php');
 		var_dump($ret);
 
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);

From db2886f1f8a0b5423c0b1479fac8e5a6c55e3a11 Mon Sep 17 00:00:00 2001
From: rwifeng <rw.ifeng@gmail.com>
Date: Mon, 14 Apr 2014 16:51:40 +0800
Subject: [PATCH 16/23] trigger travis

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4c7ff01..72879591 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -92,3 +92,4 @@
   - 待增加：rsf, batch, resumable io 的支持
 - bugfix: 修复 crc32 为负数的错误
 - 增加 `Qiniu_RS_Put/PutFile` 辅助函数，用于服务端上传
+

From b52072b5134025461bb8bacd5e4f4cbf7de28a0d Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Tue, 15 Apr 2014 11:44:18 +0800
Subject: [PATCH 17/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0reqid=E3=80=81xlog?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qiniu/http.php   | 33 ++++++++++++++++++++++++++++++++-
 tests/IoTest.php | 10 ++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/qiniu/http.php b/qiniu/http.php
index ba890e55..6e0910ed 100644
--- a/qiniu/http.php
+++ b/qiniu/http.php
@@ -86,6 +86,8 @@ function Qiniu_ResponseError($resp) // => $error
 			}
 		}
 	}
+	$err->Reqid = $reqId;
+	$err->Details = $details;
 	return $err;
 }
 
@@ -114,6 +116,8 @@ function Qiniu_Client_do($req) // => ($resp, $error)
 		CURLOPT_RETURNTRANSFER => true,
 		CURLOPT_SSL_VERIFYPEER => false,
 		CURLOPT_SSL_VERIFYHOST => false,
+		CURLOPT_HEADER => true,
+		CURLOPT_NOBODY => false,
 		CURLOPT_CUSTOMREQUEST  => 'POST',
 		CURLOPT_URL => $url['path']
 	);
@@ -141,11 +145,38 @@ function Qiniu_Client_do($req) // => ($resp, $error)
 	$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 	$contentType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
 	curl_close($ch);
-	$resp = new Qiniu_Response($code, $result);
+
+	$responseArray = explode("\r\n\r\n", $result);
+	$responseArraySize = sizeof($responseArray);
+	$respHeader = $responseArray[$responseArraySize-2];
+	$respBody = $responseArray[$responseArraySize-1];
+
+	list($reqid, $xLog) = getReqInfo($respHeader);
+
+	$resp = new Qiniu_Response($code, $respBody);
 	$resp->Header['Content-Type'] = $contentType;
+	$resp->Header["X-Reqid"] = $reqid;
+	$resp->Header["X-Log"] = $xLog;
 	return array($resp, null);
 }
 
+function getReqInfo($headerContent) {
+	$headers = explode("\r\n", $headerContent);
+	$reqid = null;
+	$xLog = null;
+	foreach($headers as $header) {
+		$header = trim($header);
+		if(strpos($header, 'X-Reqid') !== false) {
+			list($k, $v) = explode(':', $header);
+			$reqid = trim($v);
+		} elseif(strpos($header, 'X-Log') !== false) {
+			list($k, $v) = explode(':', $header);
+			$xLog = trim($v);
+		}
+	}
+	return array($reqid, $xLog);
+}
+
 class Qiniu_HttpClient
 {
 	public function RoundTrip($req) // => ($resp, $error)
diff --git a/tests/IoTest.php b/tests/IoTest.php
index fea4fa46..491b0a79 100644
--- a/tests/IoTest.php
+++ b/tests/IoTest.php
@@ -14,6 +14,16 @@ public function setUp()
 		$this->bucket = getenv("QINIU_BUCKET_NAME");
 	}
 
+	public function testReqid()
+	{
+		$key = 'testReqid' . getTid();
+		list($ret, $err) = Qiniu_PutFile("", $key, __file__, null);
+		$this->assertNotNull($err);
+		$this->assertNotNull($err->Reqid);
+		$this->assertNotNull($err->Details);
+		var_dump($err);
+	}
+
 	public function testPutFile()
 	{
 		$key = 'testPutFile' . getTid();

From 2e36b95efe60647a15dedc3d0929389a3fc14424 Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Tue, 15 Apr 2014 11:48:14 +0800
Subject: [PATCH 18/23] changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f0fc814..4fa013f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,10 @@
 
 ### v6.1.9
 
-2014-4-8 issues [#69](https://github.com/qiniu/php-sdk/pull/69)
+2014-4-8 issues [#69](https://github.com/qiniu/php-sdk/pull/69)  
 
-- [#69] 增加User Agent以方便日志查询。
+- [#69] 增加User Agent以方便日志查询。  
+- [#70] 增加Reqid、XLog信息以方便错误追溯。
 
 ### v6.1.8
 

From e2de893c132687b6181ed37d93f3a256bd926371 Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Tue, 15 Apr 2014 14:35:24 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E8=B5=9E=E4=B8=8D=E5=8A=A0=E5=85=A5xlog?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qiniu/http.php   | 1 -
 tests/IoTest.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/qiniu/http.php b/qiniu/http.php
index 6e0910ed..1064abac 100644
--- a/qiniu/http.php
+++ b/qiniu/http.php
@@ -156,7 +156,6 @@ function Qiniu_Client_do($req) // => ($resp, $error)
 	$resp = new Qiniu_Response($code, $respBody);
 	$resp->Header['Content-Type'] = $contentType;
 	$resp->Header["X-Reqid"] = $reqid;
-	$resp->Header["X-Log"] = $xLog;
 	return array($resp, null);
 }
 
diff --git a/tests/IoTest.php b/tests/IoTest.php
index 491b0a79..746f1aca 100644
--- a/tests/IoTest.php
+++ b/tests/IoTest.php
@@ -20,7 +20,6 @@ public function testReqid()
 		list($ret, $err) = Qiniu_PutFile("", $key, __file__, null);
 		$this->assertNotNull($err);
 		$this->assertNotNull($err->Reqid);
-		$this->assertNotNull($err->Details);
 		var_dump($err);
 	}
 

From c0c2cc30a88ab3c6c0b4309e56aad07d3974735d Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Tue, 15 Apr 2014 14:36:36 +0800
Subject: [PATCH 20/23] changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fa013f5..ba20e96a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 2014-4-8 issues [#69](https://github.com/qiniu/php-sdk/pull/69)  
 
 - [#69] 增加User Agent以方便日志查询。  
-- [#70] 增加Reqid、XLog信息以方便错误追溯。
+- [#70] 增加Reqid信息以方便错误追溯。
 
 ### v6.1.8
 

From 4aa6b7c43a973af012f7bf6aae50313de9f62aa6 Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Wed, 23 Apr 2014 10:48:53 +0800
Subject: [PATCH 21/23] fixed #71

---
 qiniu/http.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qiniu/http.php b/qiniu/http.php
index 5016d943..87314b81 100644
--- a/qiniu/http.php
+++ b/qiniu/http.php
@@ -137,6 +137,8 @@ function Qiniu_Client_do($req) // => ($resp, $error)
 	$body = $req->Body;
 	if (!empty($body)) {
 		$options[CURLOPT_POSTFIELDS] = $body;
+	} else {
+		$options[CURLOPT_POSTFIELDS] = "";
 	}
 	curl_setopt_array($ch, $options);
 	$result = curl_exec($ch);

From dd3627bb6e1ff3510bfa48932bfc24090bc779c2 Mon Sep 17 00:00:00 2001
From: dtynn <dtynn@163.com>
Date: Wed, 23 Apr 2014 11:15:52 +0800
Subject: [PATCH 22/23] fix #72

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7dbf50ef..3ee4d3fc 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,6 @@
         "php": ">=5.2.4"
     },
     "autoload": {
-		"psr-0": { "qiniu\\": "/" }
+		"psr-0": { "qiniu\\": "qiniu" }
 	}
 }

From 9624157a98f4ee224c25668d159663e531b8e8f6 Mon Sep 17 00:00:00 2001
From: longbai <slongbai@gmail.com>
Date: Mon, 28 Apr 2014 11:30:28 +0800
Subject: [PATCH 23/23] update changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6df692ae..42b55da8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 ### v6.1.9
 
-2014-4-8 issues [#69](https://github.com/qiniu/php-sdk/pull/69)  
+2014-4-8 issues [#75](https://github.com/qiniu/php-sdk/pull/75)
 
-- [#69] 增加User Agent以方便日志查询。  
+- [#69] 增加User Agent以方便日志查询。
 - [#70] 增加Reqid信息以方便错误追溯。
+- [#71] Qiniu_RS_Stat返回411问题。
 
 ### v6.1.8