mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-25 02:22:57 +01:00
Code Issues Releases Wiki Activity

Merge pull request #233 from frosas/do-not-reuse-curlmulti

Browse Source 
Don't reuse CurlMulti
This commit is contained in:
Michael Dowling 2013-02-07 15:29:31 -08:00
commit 7fcf34bb34
4 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Guzzle/Http/Client.php
View File

@ -397,7 +397,7 @@ class Client extends AbstractHasDispatcher implements ClientInterface
public function getCurlMulti()
{
if (!$this->curlMulti) {
$this->curlMulti = CurlMulti::getInstance();
$this->curlMulti = new CurlMulti();
}
return $this->curlMulti;

16
src/Guzzle/Http/Curl/CurlMulti.php
View File

@ -78,22 +78,6 @@ class CurlMulti extends AbstractHasDispatcher implements CurlMultiInterface
*/
private $scope = -1;
/**
* Get a cached instance of the curl multi object
*
* @return CurlMulti
*/
public static function getInstance()
{
// @codeCoverageIgnoreStart
if (!self::$instance) {
self::$instance = new self();
}
// @codeCoverageIgnoreEnd
return self::$instance;
}
/**
* {@inheritdoc}
*/

7
tests/Guzzle/Tests/Http/ClientTest.php
View File

@ -677,4 +677,11 @@ class ClientTest extends \Guzzle\Tests\GuzzleTestCase
$client = new Client();
$client->setDefaultHeaders('foo');
}
public function testDontReuseCurlMulti()
{
$client1 = new Client();
$client2 = new Client();
$this->assertNotSame($client1->getCurlMulti(), $client2->getCurlMulti());
}
}

10
tests/Guzzle/Tests/Http/Curl/CurlMultiTest.php
View File

@ -42,16 +42,6 @@ class CurlMultiTest extends \Guzzle\Tests\GuzzleTestCase
$this->mock = $this->getWildcardObserver($this->multi);
}
/**
* @covers Guzzle\Http\Curl\CurlMulti::getInstance
*/
public function testReturnsCachedInstance()
{
$c = CurlMulti::getInstance();
$this->assertInstanceOf('Guzzle\\Http\\Curl\\CurlMultiInterface', $c);
$this->assertSame($c, CurlMulti::getInstance());
}
/**
* @covers Guzzle\Http\Curl\CurlMulti::__construct
* @covers Guzzle\Http\Curl\CurlMulti::__destruct