summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2013-11-19 12:42:25 +0100
committerRemi Collet <remi@php.net>2013-11-19 12:42:25 +0100
commit87cabc04ac5081f032c55cdc67d541a92471964e (patch)
tree4f1272bf510ae5b0f57205cb6601d074551b3a2f
parente3528f086aba9796908e24dc6efdc970602ec023 (diff)
parent25c08a839a261f3da77767934d8bed29f9831db3 (diff)
downloadphp-git-87cabc04ac5081f032c55cdc67d541a92471964e.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: avoid doing a stream_select on a closed stream
-rwxr-xr-xrun-tests.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/run-tests.php b/run-tests.php
index 7eb445eeb8..a88d37d000 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -1090,6 +1090,7 @@ function system_with_timeout($commandline, $env = null, $stdin = null)
fwrite($pipes[0], $stdin);
}
fclose($pipes[0]);
+ unset($pipes[0]);
$timeout = $leak_check ? 300 : (isset($env['TEST_TIMEOUT']) ? $env['TEST_TIMEOUT'] : 60);