Merge pull request #9108 from cakephp/issue-9106

Don't split strings headers that lack a ':'.
cakephp · Jul 16, 2016 · 876b508 · 876b508
2 parents 7763e5d + 4e1b601
commit 876b508
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
@@ -577,7 +577,7 @@ public function header($header = null, $value = null) {
 			if (is_numeric($header)) {
 				list($header, $value) = array($value, null);
 			}
-			if ($value === null) {
+			if ($value === null && strpos($header, ':') !== false) {
 				list($header, $value) = explode(':', $header, 2);
 			}
 			$this->_headers[$header] = is_array($value) ? array_map('trim', $value) : trim($value);

diff --git a/lib/Cake/Test/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php
@@ -164,11 +164,15 @@ public function testHeader() {
 		$headers += array('Location' => 'http://example.com');
 		$this->assertEquals($headers, $response->header());
 
-		//Headers with the same name are overwritten
+		// Headers with the same name are overwritten
 		$response->header('Location', 'http://example2.com');
 		$headers = array('Location' => 'http://example2.com');
 		$this->assertEquals($headers, $response->header());
 
+		$response->header('Date', null);
+		$headers += array('Date' => null);
+		$this->assertEquals($headers, $response->header());
+
 		$response->header(array('WWW-Authenticate' => 'Negotiate'));
 		$headers += array('WWW-Authenticate' => 'Negotiate');
 		$this->assertEquals($headers, $response->header());