helly Thu Dec 8 19:22:22 2005 EDT Modified files: (Branch: PHP_5_1) /php-src run-tests.php Log: - Revert piece of MFH that shows an inconsistency - actually we should fix this fread() issue. http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.226.2.9&r2=1.226.2.10&ty=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.9 php-src/run-tests.php:1.226.2.10 --- php-src/run-tests.php:1.226.2.9 Thu Dec 8 17:51:01 2005 +++ php-src/run-tests.php Thu Dec 8 19:22:21 2005 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.226.2.9 2005/12/08 22:51:01 helly Exp $ */ +/* $Id: run-tests.php,v 1.226.2.10 2005/12/09 00:22:21 helly Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -333,7 +333,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo "$Id: run-tests.php,v 1.226.2.9 2005/12/08 22:51:01 helly Exp $\n"; + echo "$Id: run-tests.php,v 1.226.2.10 2005/12/09 00:22:21 helly Exp $\n"; exit(1); default: echo "Illegal switch '$switch' specified!\n"; @@ -784,7 +784,7 @@ return $data; } else if ($n > 0) { $line = fread($pipes[1], 8192); - if ($line === false) { + if (strlen($line) == 0) { /* EOF */ break; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php