Diff for /embedaddon/php/sapi/cli/tests/php_cli_server.inc between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/05/29 12:34:35 version 1.1.1.2, 2013/07/22 01:32:13
Line 1 Line 1
 <?php  <?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) {  function php_cli_server_start($code = 'echo "Hello world";', $no_router = FALSE) {
         $php_executable = getenv('TEST_PHP_EXECUTABLE');          $php_executable = getenv('TEST_PHP_EXECUTABLE');
Line 32  function php_cli_server_start($code = 'echo "Hello wor Line 34  function php_cli_server_start($code = 'echo "Hello wor
   
                 $handle = proc_open($cmd, $descriptorspec, $pipes, $doc_root);                  $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);
       }
   
       if ($fp) {
           fclose($fp);
       }
   
         register_shutdown_function(          register_shutdown_function(
                 function($handle) use($router) {                  function($handle) use($router) {
                         proc_terminate($handle);                          proc_terminate($handle);
Line 40  function php_cli_server_start($code = 'echo "Hello wor Line 53  function php_cli_server_start($code = 'echo "Hello wor
                 },                  },
                         $handle                          $handle
                 );                  );
        usleep(50000);        // 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.
 }  }
 ?>  ?>
   

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>