Merge pull request #22 from qiniu/develop

Release v6.1.0

Author: xushiwei

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## CHANGE LOG
 
+### v6.1.0
+
+2013-07-04 issue [#22](https://github.com/qiniu/api/pull/22)
+
+- hotfix: 修复上传的时候 key 中不能出现 '/' 的错误
+
+
 ### v6.0.2
 
 2013-07-04 issue [#20](https://github.com/qiniu/api/pull/20)

qiniu/conf.php

@@ -1,6 +1,6 @@
 <?php
 
-$QINIU_UP_HOST	= 'http://up.qbox.me';
+$QINIU_UP_HOST	= 'http://up.qiniu.com';
 $QINIU_RS_HOST	= 'http://rs.qbox.me';
 $QINIU_RSF_HOST	= 'http://rsf.qbox.me';
 

qiniu/http.php

@@ -251,29 +251,37 @@ function Qiniu_Build_MultipartForm($fields, $files) // => ($contentType, $body)
 	$data = array();
 	$mimeBoundary = md5(microtime());
 
-	foreach ($fields as $name => $val){
+	foreach ($fields as $name => $val) {
 		array_push($data, '--' . $mimeBoundary);
-		array_push($data, "Content-Disposition: form-data; name=$name");
+		array_push($data, "Content-Disposition: form-data; name=\"$name\"");
 		array_push($data, '');
 		array_push($data, $val);
 	}
 
 	foreach ($files as $file) {
 		array_push($data, '--' . $mimeBoundary);
-		list($name, $fileName, $fileCxt) = $file;
-		array_push($data, "Content-Disposition: form-data; name=$name; filename=$fileName");
+		list($name, $fileName, $fileBody) = $file;
+		$fileName = Qiniu_escapeQuotes($fileName);
+		array_push($data, "Content-Disposition: form-data; name=\"$name\"; filename=\"$fileName\"");
 		array_push($data, 'Content-Type: application/octet-stream');
 		array_push($data, '');
-		array_push($data, $fileCxt);
+		array_push($data, $fileBody);
 	}
 
-	array_push($data, '--' . $mimeBoundary);
+	array_push($data, '--' . $mimeBoundary . '--');
 	array_push($data, '');
 
 	$body = implode("\r\n", $data);
 	$contentType = 'multipart/form-data; boundary=' . $mimeBoundary;
 	return array($contentType, $body);
 }
 
+function Qiniu_escapeQuotes($str)
+{
+	$find = array("\\", "\"");
+	$replace = array("\\\\", "\\\"");
+	return str_replace($find, $replace, $str);
+}
+
 // --------------------------------------------------------------------------------
 

tests/RsUtilsTest.php

@@ -16,7 +16,7 @@ public function setUp()
 
 	public function testPutFile()
 	{
-		$key = 'testPutFile' . getTid();
+		$key = 'tmp/testPutFile' . getTid();
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
 		$putExtra = new Qiniu_PutExtra();
@@ -36,7 +36,7 @@ public function testPutFile()
 
 	public function testPut()
 	{
-		$key = 'testPut' . getTid();
+		$key = 'tmp/testPut' . getTid();
 		$err = Qiniu_RS_Delete($this->client, $this->bucket, $key);
 
 		list($ret, $err) = Qiniu_RS_Put($this->client, $this->bucket, $key, "hello world!", null);