Make Opcache tests using the cli server more reliable

Same fix applied to ext/curl/tests/server.inc
and sapi/cli/tests/php_cli_server.inc

1. Increases the amount of time for the PHP built-in server to accept a connection
2. Outputs an error if the PHP built-in server fails

Author: mhagstrand

ext/opcache/tests/php_cli_server.inc

@@ -4,44 +4,60 @@ define ("PHP_CLI_SERVER_PORT", 8964);
 define ("PHP_CLI_SERVER_ADDRESS", PHP_CLI_SERVER_HOSTNAME.":".PHP_CLI_SERVER_PORT);
 
 function php_cli_server_start($ini = "") {
-	$php_executable = getenv('TEST_PHP_EXECUTABLE');
-	$doc_root = __DIR__;
-
-	$descriptorspec = array(
-		0 => STDIN,
-		1 => STDOUT,
-		2 => STDERR,
-	);
-
-	if (substr(PHP_OS, 0, 3) == 'WIN') {
-		$cmd = "{$php_executable} -t {$doc_root} $ini -S " . PHP_CLI_SERVER_ADDRESS;
-		$handle = proc_open(addslashes($cmd), $descriptorspec, $pipes, $doc_root, NULL, array("bypass_shell" => true,  "suppress_errors" => true));
-	} else {
-		$cmd = "exec {$php_executable} -t {$doc_root} $ini -S " . PHP_CLI_SERVER_ADDRESS . " 2>/dev/null";
-		$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
-    $i = 0;
-    while (($i++ < 30) && !($fp = @fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT))) {
-        usleep(10000);
+    $php_executable = getenv('TEST_PHP_EXECUTABLE');
+    $doc_root = __DIR__;
+
+    $descriptorspec = array(
+        0 => STDIN,
+        1 => STDOUT,
+        2 => STDERR,
+    );
+
+    if (substr(PHP_OS, 0, 3) == 'WIN') {
+        $cmd = "{$php_executable} -t {$doc_root} $ini -S " . PHP_CLI_SERVER_ADDRESS;
+        $handle = proc_open(addslashes($cmd), $descriptorspec, $pipes, $doc_root, NULL, array("bypass_shell" => true,  "suppress_errors" => true));
+    } else {
+        $cmd = "exec {$php_executable} -t {$doc_root} $ini -S " . PHP_CLI_SERVER_ADDRESS . " 2>/dev/null";
+        $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
+    $error = "Unable to connect to servers\n";
+    for ($i=0; $i < 60; $i++) {
+        usleep(25000); // 25ms per try
+        $status = proc_get_status($handle);
+        $fp = @fsockopen(PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT);
+        // Failure, the server is no longer running
+        if (!($status && $status['running'])) {
+            $error = "Server is not running\n";
+            break;
+        }
+        // Success, Connected to servers
+        if ($fp) {
+            $error = '';
+            break;
+        }
     }
 
     if ($fp) {
         fclose($fp);
     }
 
-	register_shutdown_function(
-		function($handle) {
-			proc_terminate($handle);
-		},
-			$handle
-		);
-	// don't bother sleeping, server is already up
-	// 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.
+    if ($error) {
+        echo $error;
+        proc_terminate($handle);
+        exit(1);
+    }
+
+    register_shutdown_function(
+        function($handle) {
+            proc_terminate($handle);
+        },
+        $handle
+    );
+
 }
 ?>