From 637ab82a48cb330e75eae2c9a362c456ca444da6 Mon Sep 17 00:00:00 2001
From: Juan Basso <jrbasso@gmail.com>
Date: Wed, 23 Jun 2010 00:10:21 -0300
Subject: [PATCH] Setting cookies in a single line. Fixes #48

---
 cake/libs/http_socket.php                  | 2 +-
 cake/tests/cases/libs/http_socket.test.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
index 3539afc68d9..321e9251daa 100644
--- a/cake/libs/http_socket.php
+++ b/cake/libs/http_socket.php
@@ -890,7 +890,7 @@ function buildCookies($cookies) {
 		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 0fa79d4535a..eda11d3dab5 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/cake/tests/cases/libs/http_socket.test.php
@@ -1228,7 +1228,7 @@ function testBuildCookies() {
 				'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);
 	}