Merge pull request #76 from dtynn/feature/urlencode_slash

urlencode对/进行特殊处理
qiniu · Apr 28, 2014 · f289aa7 · f289aa7
2 parents 9624157 + 1a974ae
commit f289aa7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
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");
+	}
 }