Fix bug 61769 Random failure of php_cli_server*phpt tests

diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc
index 44ee76ea7fcc24d8176354b028e8e1283fd826e8..d24a679e77883ee998de1a8e864cc62a4fbb858c 100644 (file)
--- 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 4b56caa70fec61c33c068211ff362681c81df435..2eca8706bb1b3fbd9a1caea9c74130825296d2a8 100644 (file)
--- 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");