D21466.diff
No OneTemporary
Actions

Size

645 B

Referenced Files

None

Subscribers

None

D21466.diff
View Options

	diff --git a/src/future/FutureIterator.php b/src/future/FutureIterator.php
	--- a/src/future/FutureIterator.php
	+++ b/src/future/FutureIterator.php
	@@ -194,7 +194,14 @@
	* @task iterator
	*/
	public function next() {
	- $this->key = null;
	+ // See T13572. If we preivously resolved and returned a Future, release
	+ // it now. This prevents us from holding Futures indefinitely when callers
	+ // like FuturePool build long-lived iterators and keep adding new Futures
	+ // to them.
	+ if ($this->key !== null) {
	+ unset($this->futures[$this->key]);
	+ $this->key = null;
	+ }

	$this->updateWorkingSet();