Base64 encode chunked data before dechunking

UnionOfRAD · Nov 14, 2013 · ae904d3 · ae904d3
1 parent d884ce3
commit ae904d3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/net/http/Response.php b/net/http/Response.php
@@ -406,7 +406,7 @@ protected function _httpChunkedDecode($body) {
 		if (stripos($this->headers('Transfer-Encoding'), 'chunked') === false) {
 			return $body;
 		}
-		$stream = fopen('data://text/plain,' . $body, 'r');
+		$stream = fopen('data://text/plain;base64,' . base64_encode($body), 'r');
 		stream_filter_append($stream, 'dechunk');
 		return trim(stream_get_contents($stream));
 	}

diff --git a/tests/cases/net/http/ResponseTest.php b/tests/cases/net/http/ResponseTest.php
@@ -390,6 +390,17 @@ public function testTransferEncodingChunkedDecode()  {
 		$response = new Response(compact('message'));
 		$result = $response->body();
 		$this->assertEqual($expected, $result);
+
+		$expected = '1+1 is 2, 10%40 is 20.';
+		$message = $headers . join("\r\n", array(
+			'22',
+			$expected,
+			'',
+		));
+
+		$response = new Response(compact('message'));
+		$result = $response->body();
+		$this->assertEqual($expected, $result);
 	}
 
 	public function testTypePriority() {