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

Workaround for https://github.com/guzzle/guzzle/issues/832

Browse Source 
Allows exception handler to indicate that *all* handles should be
pruned.
This commit is contained in:
Michael Moussa 2014-09-24 11:28:04 -04:00
parent 138f869863
commit e6967f9395
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Adapter/Curl/MultiAdapter.php
View File

@ -246,7 +246,7 @@ class MultiAdapter implements AdapterInterface, ParallelAdapterInterface
|| ($e instanceof RequestException && $e->getThrowImmediately())
) {
$context->removeAll();
$this->releaseMultiHandle($context->getMultiHandle());
$this->releaseMultiHandle($context->getMultiHandle(), -1);
throw $e;
}
}
@ -278,14 +278,15 @@ class MultiAdapter implements AdapterInterface, ParallelAdapterInterface
* Releases a curl_multi handle back into the cache and removes excess cache
*
* @param resource $handle Curl multi handle to remove
* @param int $pruneThreshold (Optional) Maximum number of existing multiHandles to allow before pruning.
*/
private function releaseMultiHandle($handle)
private function releaseMultiHandle($handle, $pruneThreshold = 3)
{
$id = (int) $handle;
if (count($this->multiHandles) <= 3) {
if (count($this->multiHandles) <= $pruneThreshold) {
$this->multiOwned[$id] = false;
} else {
} elseif (isset($this->multiHandles[$id], $this->multiOwned[$id])) {
// Prune excessive handles
curl_multi_close($this->multiHandles[$id]);
unset($this->multiHandles[$id], $this->multiOwned[$id]);