1 files changed, 50 insertions, 17 deletions

diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc
index 6b1e90c4dc..6e7b70cb60 100644
--- a/sapi/cli/tests/php_cli_server.inc
+++ b/sapi/cli/tests/php_cli_server.inc
@@ -33,29 +33,62 @@ function php_cli_server_start($code = 'echo "Hello world";', $router = 'index.ph
 
 		$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);
+
+    // 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) use($router) {
-			proc_terminate($handle);
-			@unlink(__DIR__ . "/{$router}");
-		},
-			$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) use($router) {
+            proc_terminate($handle);
+            @unlink(__DIR__ . "/{$router}");
+        },
+        $handle
+    );
+
+    return $handle;
+}
+
+function php_cli_server_stop($handle) {
+    $success = FALSE;
+    if ($handle) {
+        proc_terminate($handle);
+        /* Wait for server to shutdown */
+        for ($i = 0; $i < 60; $i++) {
+            $status = proc_get_status($handle);
+            if (!($status && $status['running'])) {
+                $success = TRUE;
+                break;
+            }
+            usleep(25000);
+        }
+    }
+    return $success;
 }
 ?>