diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php index a5c24c9fc..6686ebbce 100644 --- a/cake/libs/http_socket.php +++ b/cake/libs/http_socket.php @@ -975,7 +975,7 @@ class HttpSocket extends CakeSocket { foreach ($cookies as $name => $cookie) { $header[] = $name.'='.$this->_escapeToken($cookie['value'], array(';')); } - $header = $this->_buildHeader(array('Cookie' => $header), 'pragmatic'); + $header = $this->_buildHeader(array('Cookie' => implode('; ', $header)), 'pragmatic'); return $header; } diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php index 1c3d04f6c..d61d654f5 100644 --- a/cake/tests/cases/libs/http_socket.test.php +++ b/cake/tests/cases/libs/http_socket.test.php @@ -1375,7 +1375,7 @@ class HttpSocketTest extends CakeTestCase { 'path' => '/accounts' ) ); - $expect = "Cookie: foo=bar\r\nCookie: people=jim,jack,johnny\";\"\r\n"; + $expect = "Cookie: foo=bar; people=jim,jack,johnny\";\"\r\n"; $result = $this->Socket->buildCookies($cookies); $this->assertEqual($result, $expect); }