com php-src: Fix bug 61769 Random failure of php_cli_server *phpt tests: sapi/cli/tests/php_cli_server.inc sa pi/cli/tests/php_cli_server_014.phpt

Commit: 87a011d3723aa9500e12a3f982df6b1f5cdfaedd Author: Matt Ficken <mattficken@php.net> Sun, 6 May 2012 18:05:02 +0200 Committer: Anatoliy Belsky <ab@php.net> Sun, 6 May 2012 18:05:02 +0200 Parents: ad3a42c26c185d47aee8e69aad255c8824af4ded Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=87a011d3723aa9500e12a3f982df6b1f5cdfaedd Log: Fix bug 61769 Random failure of php_cli_server*phpt tests Bugs: https://bugs.php.net/61769 Changed paths: M sapi/cli/tests/php_cli_server.inc M sapi/cli/tests/php_cli_server_014.phpt Diff: diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc index 44ee76e..d24a679 100644 --- a/sapi/cli/tests/php_cli_server.inc +++ b/sapi/cli/tests/php_cli_server.inc @@ -1,5 +1,7 @@ <?php -define ("PHP_CLI_SERVER_ADDRESS", "localhost:8964"); +define ("PHP_CLI_SERVER_HOSTNAME", "localhost"); +define ("PHP_CLI_SERVER_PORT", 8964); +define ("PHP_CLI_SERVER_ADDRESS", PHP_CLI_SERVER_HOSTNAME.":".PHP_CLI_SERVER_PORT); function php_cli_server_start($code = 'echo "Hello world";', $no_router = FALSE) { $php_executable = getenv('TEST_PHP_EXECUTABLE'); @@ -32,6 +34,19 @@ function php_cli_server_start($code = 'echo "Hello world";', $no_router = FALSE) $handle = proc_open($cmd, $descriptorspec, $pipes, $doc_root); } + + // note: even when server prints 'Listening on localhost:8964...Press Ctrl-C to quit.' + // it might not be listening yet...need to wait until fsockopen() call returns + $fp = fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT); + if ($fp) { + // server will report Unexpected EOF error (socket opened, closed without writing + // anything) but that can be ignored + fclose($fp); + } else { + // test will fail to connect if server doesn't start listening/accepting + // in the next few microseconds + } + register_shutdown_function( function($handle) use($router) { @@ -40,7 +55,11 @@ function php_cli_server_start($code = 'echo "Hello world";', $no_router = FALSE) }, $handle ); - usleep(50000); + // don't bother sleeping, server is already up + //usleep(50000); + // server can take a variable amount of time to be up, so just sleeping a guessed amount of time + // does not work. this is why tests sometimes pass and sometimes fail. to get a reliable pass + // sleeping doesn't work. } ?> diff --git a/sapi/cli/tests/php_cli_server_014.phpt b/sapi/cli/tests/php_cli_server_014.phpt index 4b56caa..2eca870 100644 --- a/sapi/cli/tests/php_cli_server_014.phpt +++ b/sapi/cli/tests/php_cli_server_014.phpt @@ -13,6 +13,10 @@ list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); $port = intval($port)?:80; $output = ''; +// note: select() on Windows (& some other platforms) has historical issues with +// timeouts less than 1000 millis(0.5). it may be better to increase these +// timeouts to 1000 millis(1.0) (fsockopen eventually calls select()). +// see articles like: http://support.microsoft.com/kb/257821 $fp = fsockopen($host, $port, $errno, $errstr, 0.5); if (!$fp) { die("connect failed");