diff --git a/cake/libs/cake_socket.php b/cake/libs/cake_socket.php index ad999a35e..907838b6a 100644 --- a/cake/libs/cake_socket.php +++ b/cake/libs/cake_socket.php @@ -27,7 +27,7 @@ App::import('Core', 'Validation'); * @package cake * @subpackage cake.cake.libs */ -class CakeSocket extends Object { +class CakeSocket { /** * Object description @@ -90,8 +90,6 @@ class CakeSocket extends Object { * @see CakeSocket::$_baseConfig */ function __construct($config = array()) { - parent::__construct(); - $this->config = array_merge($this->_baseConfig, $config); if (!is_numeric($this->config['protocol'])) { $this->config['protocol'] = getprotobyname($this->config['protocol']); diff --git a/cake/tests/cases/libs/cake_socket.test.php b/cake/tests/cases/libs/cake_socket.test.php index 0e548c728..dca26e130 100644 --- a/cake/tests/cases/libs/cake_socket.test.php +++ b/cake/tests/cases/libs/cake_socket.test.php @@ -145,13 +145,13 @@ class CakeSocketTest extends CakeTestCase { $this->Socket->connect(); $this->assertEqual($this->Socket->read(26), null); - $config = array('host' => 'www.cakephp.org', 'timeout' => 1); + $config = array('host' => '127.0.0.1', 'timeout' => 1); $this->Socket = new CakeSocket($config); $this->assertTrue($this->Socket->connect()); $this->assertFalse($this->Socket->read(1024 * 1024)); $this->assertEqual($this->Socket->lastError(), '2: ' . __('Connection timed out')); - $config = array('host' => 'www.cakephp.org', 'timeout' => 30); + $config = array('host' => 'localhost', 'timeout' => 30); $this->Socket = new CakeSocket($config); $this->assertTrue($this->Socket->connect()); $this->assertEqual($this->Socket->read(26), null);