Merge branch '2.1' into 2.2

This commit is contained in:
mark_story 2012-04-06 21:34:11 -04:00
commit 4eea72205b
4 changed files with 7 additions and 6 deletions

View file

@ -390,11 +390,10 @@ class HttpSocket extends CakeSocket {
}
list($plugin, $responseClass) = pluginSplit($this->responseClass, true);
App::uses($this->responseClass, $plugin . 'Network/Http');
App::uses($responseClass, $plugin . 'Network/Http');
if (!class_exists($responseClass)) {
throw new SocketException(__d('cake_dev', 'Class %s not found.', $this->responseClass));
}
$responseClass = $this->responseClass;
$this->response = new $responseClass($response);
if (!empty($this->response->cookies)) {
if (!isset($this->config['request']['cookies'][$Host])) {