Merge pull request #76 from dtynn/feature/urlencode_slash

longbai · longbai · commit f289aa7bb4ef · 2014-04-28T23:48:10.000+08:00
urlencode对/进行特殊处理
diff --git a/qiniu/rs.php b/qiniu/rs.php
@@ -32,7 +32,7 @@ public function MakeRequest($baseUrl, $mac) // => $privateUrl
 
 function Qiniu_RS_MakeBaseUrl($domain, $key) // => $baseUrl
 {
-	$keyEsc = rawurlencode($key);
+	$keyEsc = str_replace("%2F", "/", rawurlencode($key));
 	return "http://$domain/$keyEsc";
 }
 
diff --git a/tests/RsTest.php b/tests/RsTest.php
@@ -88,5 +88,11 @@ public function testBatchDeleteMoveCopy()
 
 		Qiniu_RS_BatchDelete($this->client, array($e2, $e3, $e4));
 	}
+
+	public function testUrlEncode() {
+		$url = Qiniu_RS_MakeBaseUrl("www.qiniu.com", "a/b/c d");
+		var_dump($url);
+		$this->assertEquals($url, "http://www.qiniu.com/a/b/c%20d");
+	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function MakeRequest($baseUrl, $mac) // => $privateUrl`
`32`	`32`
`33`	`33`	`function Qiniu_RS_MakeBaseUrl($domain, $key) // => $baseUrl`
`34`	`34`	`{`
`35`		`- $keyEsc = rawurlencode($key);`
	`35`	`+ $keyEsc = str_replace("%2F", "/", rawurlencode($key));`
`36`	`36`	`return "http://$domain/$keyEsc";`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -88,5 +88,11 @@ public function testBatchDeleteMoveCopy()`
`88`	`88`
`89`	`89`	`Qiniu_RS_BatchDelete($this->client, array($e2, $e3, $e4));`
`90`	`90`	`}`
	`91`	`+`
	`92`	`+ public function testUrlEncode() {`
	`93`	`+ $url = Qiniu_RS_MakeBaseUrl("www.qiniu.com", "a/b/c d");`
	`94`	`+ var_dump($url);`
	`95`	`+ $this->assertEquals($url, "http://www.qiniu.com/a/b/c%20d");`
	`96`	`+ }`
`91`	`97`	`}`
`92`	`98`