Not sending a content-length for redirection status codes that are no…

…t supposed to have any content
cakephp · Oct 28, 2011 · 9866882 · 9866882
1 parent aabfad9
commit 9866882
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
@@ -351,8 +351,8 @@ public function send() {
 		$this->_sendHeader("{$this->_protocol} {$this->_status} {$codeMessage}");
 		$this->_sendHeader('Content-Type', "{$this->_contentType}; charset={$this->_charset}");
 		$shouldSetLength = empty($this->_headers['Content-Length']) && class_exists('Multibyte');
-		$shouldSetLength = $shouldSetLength && !$this->outputCompressed();
-		if ($shouldSetLength) {
+		$shouldSetLength = $shouldSetLength && !in_array($this->_status, range(301, 307));
+		if ($shouldSetLength && !$this->outputCompressed()) {
 			$this->_headers['Content-Length'] = mb_strlen($this->_body);
 		}
 		foreach ($this->_headers as $header => $value) {

diff --git a/lib/Cake/Test/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php
@@ -416,5 +416,13 @@ public function testSendContentLength() {
 			$response->expects($this->at(2))
 				->method('_sendHeader')->with('Content-Length', 1);
 		$response->send();
+
+		$response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent'));
+		$body = 'content';
+		$response->statusCode(301);
+		$response->body($body);
+		$response->expects($this->once())->method('_sendContent')->with($body);
+		$response->expects($this->exactly(2))->method('_sendHeader');
+		$response->send();
 	}
 }