summaryrefslogtreecommitdiff
path: root/sapi/cli
diff options
context:
space:
mode:
Diffstat (limited to 'sapi/cli')
-rw-r--r--sapi/cli/php_cli.c47
-rw-r--r--sapi/cli/php_cli_server.c10
-rw-r--r--sapi/cli/tests/CONFLICTS1
-rw-r--r--sapi/cli/tests/bug61977.phpt31
-rw-r--r--sapi/cli/tests/bug67429_1.phpt2
-rw-r--r--sapi/cli/tests/bug67429_2.phpt2
-rw-r--r--sapi/cli/tests/bug68291.phpt9
-rw-r--r--sapi/cli/tests/bug69655.phpt6
-rw-r--r--sapi/cli/tests/php_cli_server.inc110
-rw-r--r--sapi/cli/tests/php_cli_server_002.phpt4
-rw-r--r--sapi/cli/tests/php_cli_server_012.phpt4
-rw-r--r--sapi/cli/tests/php_cli_server_015.phpt7
12 files changed, 126 insertions, 107 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 330c91d58b..472ce013ea 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -172,6 +172,9 @@ const opt_struct OPTIONS[] = {
{14, 1, "ri"},
{14, 1, "rextinfo"},
{15, 0, "ini"},
+ /* Internal testing option -- may be changed or removed without notice,
+ * including in patch releases. */
+ {16, 1, "repeat"},
{'-', 0, NULL} /* end of args */
};
@@ -529,7 +532,7 @@ static void php_cli_usage(char *argv0)
static php_stream *s_in_process = NULL;
-static void cli_register_file_handles(void) /* {{{ */
+static void cli_register_file_handles(bool no_close) /* {{{ */
{
php_stream *s_in, *s_out, *s_err;
php_stream_context *sc_in=NULL, *sc_out=NULL, *sc_err=NULL;
@@ -546,11 +549,11 @@ static void cli_register_file_handles(void) /* {{{ */
return;
}
-#if PHP_DEBUG
- /* do not close stdout and stderr */
- s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;
- s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE;
-#endif
+ if (no_close) {
+ s_in->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+ s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+ s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+ }
s_in_process = s_in;
@@ -614,6 +617,8 @@ static int do_cli(int argc, char **argv) /* {{{ */
int interactive=0;
const char *param_error=NULL;
int hide_argv = 0;
+ int num_repeats = 1;
+ pid_t pid = getpid();
zend_try {
@@ -640,12 +645,12 @@ static int do_cli(int argc, char **argv) /* {{{ */
#else
"NTS "
#endif
-#ifdef COMPILER
- COMPILER
+#ifdef PHP_BUILD_COMPILER
+ PHP_BUILD_COMPILER
" "
#endif
-#ifdef ARCHITECTURE
- ARCHITECTURE
+#ifdef PHP_BUILD_ARCH
+ PHP_BUILD_ARCH
" "
#endif
#if ZEND_DEBUG
@@ -839,6 +844,9 @@ static int do_cli(int argc, char **argv) /* {{{ */
case 15:
behavior = PHP_MODE_SHOW_INI_CONFIG;
break;
+ case 16:
+ num_repeats = atoi(php_optarg);
+ break;
default:
break;
}
@@ -873,6 +881,12 @@ static int do_cli(int argc, char **argv) /* {{{ */
fflush(stdout);
}
+ if (num_repeats > 1) {
+ fprintf(stdout, "Executing for the first time...\n");
+ fflush(stdout);
+ }
+
+do_repeat:
/* only set script_file if not set already and not in direct mode and not at end of parameter list */
if (argc > php_optind
&& !script_file
@@ -884,6 +898,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
php_optind++;
}
if (script_file) {
+ virtual_cwd_activate();
if (cli_seek_file_begin(&file_handle, script_file) != SUCCESS) {
goto err;
} else {
@@ -940,7 +955,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
switch (behavior) {
case PHP_MODE_STANDARD:
if (strcmp(file_handle.filename, "Standard input code")) {
- cli_register_file_handles();
+ cli_register_file_handles(/* no_close */ PHP_DEBUG || num_repeats > 1);
}
if (interactive && cli_shell_callbacks.cli_shell_run) {
@@ -975,7 +990,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
}
break;
case PHP_MODE_CLI_DIRECT:
- cli_register_file_handles();
+ cli_register_file_handles(/* no_close */ PHP_DEBUG || num_repeats > 1);
zend_eval_string_ex(exec_direct, NULL, "Command line code", 1);
break;
@@ -985,7 +1000,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
size_t len, index = 0;
zval argn, argi;
- cli_register_file_handles();
+ cli_register_file_handles(/* no_close */ PHP_DEBUG || num_repeats > 1);
if (exec_begin) {
zend_eval_string_ex(exec_begin, NULL, "Command line begin code", 1);
@@ -1112,6 +1127,12 @@ out:
if (translated_path) {
free(translated_path);
}
+ /* Don't repeat fork()ed processes. */
+ if (--num_repeats && pid == getpid()) {
+ fprintf(stdout, "Finished execution, repeating...\n");
+ fflush(stdout);
+ goto do_repeat;
+ }
return EG(exit_status);
err:
sapi_deactivate();
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 4fe975d6a4..6d28b472d7 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1123,7 +1123,7 @@ static void php_cli_server_log_response(php_cli_server_client *client, int statu
{
int color = 0, effective_status = status;
char *basic_buf, *message_buf = "", *error_buf = "";
- zend_bool append_error_message = 0;
+ bool append_error_message = 0;
if (PG(last_error_message)) {
if (PG(last_error_type) & E_FATAL_ERRORS) {
@@ -1821,12 +1821,8 @@ static size_t php_cli_server_client_send_through(php_cli_server_client *client,
int nfds = php_pollfd_for(client->sock, POLLOUT, &tv);
if (nfds > 0) {
continue;
- } else if (nfds < 0) {
- /* error */
- php_handle_aborted_connection();
- return nbytes_left;
} else {
- /* timeout */
+ /* error or timeout */
php_handle_aborted_connection();
return nbytes_left;
}
@@ -2736,7 +2732,7 @@ int do_cli_server(int argc, char **argv) /* {{{ */
sapi_module.phpinfo_as_text = 0;
{
- zend_bool ipv6 = strchr(server.host, ':');
+ bool ipv6 = strchr(server.host, ':');
php_cli_server_logf(
PHP_CLI_SERVER_LOG_PROCESS,
"PHP %s Development Server (http://%s%s%s:%d) started",
diff --git a/sapi/cli/tests/CONFLICTS b/sapi/cli/tests/CONFLICTS
deleted file mode 100644
index 254defddb5..0000000000
--- a/sapi/cli/tests/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-server
diff --git a/sapi/cli/tests/bug61977.phpt b/sapi/cli/tests/bug61977.phpt
index b55c6a2e8f..e804e0dfce 100644
--- a/sapi/cli/tests/bug61977.phpt
+++ b/sapi/cli/tests/bug61977.phpt
@@ -7,7 +7,7 @@ include "skipif.inc";
--FILE--
<?php
include "php_cli_server.inc";
-php_cli_server_start('<?php ?>', null);
+$doc_root = php_cli_server_start('<?php ?>', null)->docRoot;
/*
* If a Mime Type is added in php_cli_server.c, add it to this array and update
@@ -15,32 +15,29 @@ php_cli_server_start('<?php ?>', null);
*/
$mimetypes = ['html', 'htm', 'svg', 'css', 'js', 'png', 'webm', 'ogv', 'ogg'];
-function test_mimetypes($mimetypes) {
- foreach ($mimetypes as $mimetype) {
- $host = PHP_CLI_SERVER_HOSTNAME;
- $fp = php_cli_server_connect();
- if (!$fp) die('Connect failed');
- file_put_contents(__DIR__ . "/foo.{$mimetype}", '');
- $header = <<<HEADER
+foreach ($mimetypes as $mimetype) {
+ $host = PHP_CLI_SERVER_HOSTNAME;
+ $fp = php_cli_server_connect();
+ if (!$fp) die('Connect failed');
+ file_put_contents($doc_root . "/foo.{$mimetype}", '');
+ $header = <<<HEADER
GET /foo.{$mimetype} HTTP/1.1
Host: {$host}
HEADER;
- if (fwrite($fp, $header)) {
- while (!feof($fp)) {
- $text = fgets($fp);
- if (strncasecmp("Content-type:", $text, 13) == 0) {
- echo "foo.{$mimetype} => ", $text;
- }
+ if (fwrite($fp, $header)) {
+ while (!feof($fp)) {
+ $text = fgets($fp);
+ if (strncasecmp("Content-type:", $text, 13) == 0) {
+ echo "foo.{$mimetype} => ", $text;
}
- @unlink(__DIR__ . "/foo.{$mimetype}");
- fclose($fp);
}
+ @unlink($doc_root . "/foo.{$mimetype}");
+ fclose($fp);
}
}
-test_mimetypes($mimetypes);
?>
--EXPECT--
foo.html => Content-Type: text/html; charset=UTF-8
diff --git a/sapi/cli/tests/bug67429_1.phpt b/sapi/cli/tests/bug67429_1.phpt
index 5b23818bdb..5519463340 100644
--- a/sapi/cli/tests/bug67429_1.phpt
+++ b/sapi/cli/tests/bug67429_1.phpt
@@ -8,7 +8,7 @@ include "skipif.inc";
<?php
include "php_cli_server.inc";
-$proc_handle = php_cli_server_start(<<<PHP
+php_cli_server_start(<<<PHP
http_response_code(308);
PHP
);
diff --git a/sapi/cli/tests/bug67429_2.phpt b/sapi/cli/tests/bug67429_2.phpt
index 381c7af8e5..5c4fffe410 100644
--- a/sapi/cli/tests/bug67429_2.phpt
+++ b/sapi/cli/tests/bug67429_2.phpt
@@ -8,7 +8,7 @@ include "skipif.inc";
<?php
include "php_cli_server.inc";
-$proc_handle = php_cli_server_start(<<<PHP
+php_cli_server_start(<<<PHP
http_response_code(426);
PHP
);
diff --git a/sapi/cli/tests/bug68291.phpt b/sapi/cli/tests/bug68291.phpt
index 62042307c5..1082194f5f 100644
--- a/sapi/cli/tests/bug68291.phpt
+++ b/sapi/cli/tests/bug68291.phpt
@@ -9,13 +9,10 @@ include "skipif.inc";
--FILE--
<?php
include "php_cli_server.inc";
-file_put_contents(__DIR__ . '/bug68291+test.html', 'Found');
-php_cli_server_start(NULL, NULL);
+$docRoot = php_cli_server_start(NULL, NULL)->docRoot;
+file_put_contents($docRoot . '/bug68291+test.html', 'Found');
echo file_get_contents('http://' . PHP_CLI_SERVER_ADDRESS . '/bug68291+test.html');
-?>
---CLEAN--
-<?php
-@unlink(__DIR__ . '/bug68291+test.html');
+@unlink($docRoot . '/bug68291+test.html');
?>
--EXPECT--
Found
diff --git a/sapi/cli/tests/bug69655.phpt b/sapi/cli/tests/bug69655.phpt
index b5612357f9..4ab53bcbaa 100644
--- a/sapi/cli/tests/bug69655.phpt
+++ b/sapi/cli/tests/bug69655.phpt
@@ -17,11 +17,11 @@ foreach (['MKCO', 'MKCOLL', 'M'] as $method) {
}
?>
--EXPECTF--
-Warning: file_get_contents(http://localhost:8964): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
+Warning: file_get_contents(http://localhost:%d): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
in %s on line %d
-Warning: file_get_contents(http://localhost:8964): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
+Warning: file_get_contents(http://localhost:%d): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
in %s on line %d
-Warning: file_get_contents(http://localhost:8964): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
+Warning: file_get_contents(http://localhost:%d): Failed to open stream: HTTP request failed! HTTP/1.1 501 Not Implemented
in %s on line %d
diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc
index 4cf8705a33..26bdd4c18f 100644
--- a/sapi/cli/tests/php_cli_server.inc
+++ b/sapi/cli/tests/php_cli_server.inc
@@ -1,22 +1,29 @@
<?php
-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);
+
+// TODO: Move address/port info in here?
+class CliServerInfo {
+ public function __construct(
+ public string $docRoot,
+ ) {}
+}
function php_cli_server_start(
?string $code = 'echo "Hello world";',
?string $router = 'index.php',
array $cmd_args = []
-) {
+): CliServerInfo {
$php_executable = getenv('TEST_PHP_EXECUTABLE');
- $doc_root = __DIR__;
$error = null;
+ // Create dedicated doc root to avoid index.php clashes between tests.
+ $doc_root = __DIR__ . '/' . basename($_SERVER['PHP_SELF'], '.php');
+ @mkdir($doc_root);
+
if ($code) {
file_put_contents($doc_root . '/' . ($router ?: 'index.php'), '<?php ' . $code . ' ?>');
}
- $cmd = [$php_executable, '-t', $doc_root, '-n', ...$cmd_args, '-S', PHP_CLI_SERVER_ADDRESS];
+ $cmd = [$php_executable, '-t', $doc_root, '-n', ...$cmd_args, '-S', 'localhost:0'];
if (!is_null($router)) {
$cmd[] = $router;
}
@@ -24,62 +31,58 @@ function php_cli_server_start(
$descriptorspec = array(
0 => STDIN,
1 => STDOUT,
- 2 => array("null"),
+ 2 => ['pipe', 'w'],
);
$handle = proc_open($cmd, $descriptorspec, $pipes, $doc_root, null, array("suppress_errors" => true));
- // note: here we check the process is running
- for ($i=0; $i < 120; $i++) {
+ // First, wait for the dev server to declare itself ready.
+ $bound = null;
+ stream_set_blocking($pipes[2], false);
+ for ($i = 0; $i < 60; $i++) {
+ usleep(50000); // 50ms per try
$status = proc_get_status($handle);
+ if (empty($status['running'])) {
+ echo "Server is not running\n";
+ proc_terminate($handle);
+ exit(1);
+ }
- if (!$status || !$status['running']) {
- if ($status &&
- ($status['running'] == false && $status['exitcode'] != 0)) {
- $error =
- "Server could not be started\n";
- break;
+ while (($line = fgets($pipes[2])) !== false) {
+ if (preg_match('@PHP \S* Development Server \(https?://(.*?:\d+)\) started@', $line, $matches)) {
+ $bound = $matches[1];
+ // Now that we've identified the listen address, close STDERR.
+ // Otherwise the pipe may clog up with unread log messages.
+ fclose($pipes[2]);
+ break 2;
}
-
- usleep(50000); // 50ms per try
- continue;
}
+ }
+ if ($bound === null) {
+ echo "Server did not output startup message";
+ proc_terminate($handle);
+ exit(1);
+ }
- if ($status['signaled']) {
- $error =
- "Server was terminated with {$status['termsig']}\n";
+ // Now wait for a connection to succeed.
+ // 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 server\n";
+ for ($i=0; $i < 60; $i++) {
+ usleep(50000); // 50ms per try
+ $status = proc_get_status($handle);
+ $fp = @fsockopen("tcp://$bound");
+ // Failure, the server is no longer running
+ if (!($status && $status['running'])) {
+ $error = "Server is not running\n";
break;
}
-
- if ($status['stopped']) {
- $error =
- "Server was stopped with {$status['stopsig']}\n";
+ // Success, Connected to servers
+ if ($fp) {
+ $error = '';
break;
}
-
- // note: here we check the server is listening, even when the server prints
- // listening on %s:%d
- // it may not be ready to accept connections
- $start = time();
-
- for ($try = 0; $try < 120; $try++) {
- $error = @fsockopen(
- PHP_CLI_SERVER_HOSTNAME, PHP_CLI_SERVER_PORT) ?
- null :
- sprintf(
- "Server is not accepting connections after %d seconds\n",
- time() - $start);
-
- if (!$error) {
- break 2;
- }
-
- usleep(50000);
- }
-
- break;
}
-php_cli_server_start_error:
if ($error) {
echo $error;
proc_terminate($handle);
@@ -87,14 +90,21 @@ php_cli_server_start_error:
}
register_shutdown_function(
- function($handle) use($router) {
+ function($handle) use($router, $doc_root) {
proc_terminate($handle);
@unlink(__DIR__ . "/{$router}");
+ @rmdir($doc_root);
},
$handle
);
- return $handle;
+ // Define the same "constants" we previously did.
+ $port = (int) substr($bound, strrpos($bound, ':') + 1);
+ define("PHP_CLI_SERVER_HOSTNAME", "localhost");
+ define("PHP_CLI_SERVER_PORT", $port);
+ define("PHP_CLI_SERVER_ADDRESS", PHP_CLI_SERVER_HOSTNAME.":".PHP_CLI_SERVER_PORT);
+
+ return new CliServerInfo($doc_root);
}
function php_cli_server_connect() {
diff --git a/sapi/cli/tests/php_cli_server_002.phpt b/sapi/cli/tests/php_cli_server_002.phpt
index e1fbd90398..2daf6aad73 100644
--- a/sapi/cli/tests/php_cli_server_002.phpt
+++ b/sapi/cli/tests/php_cli_server_002.phpt
@@ -13,8 +13,8 @@ php_cli_server_start('var_dump($_SERVER["DOCUMENT_ROOT"], $_SERVER["SERVER_SOFTW
var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS));
?>
--EXPECTF--
-string(%d) "string(%d) "%stests"
+string(%d) "string(%d) "%sphp_cli_server_002"
string(%d) "PHP %s Development Server"
string(%d) "localhost"
-string(%d) "8964"
+string(%d) "%s"
"
diff --git a/sapi/cli/tests/php_cli_server_012.phpt b/sapi/cli/tests/php_cli_server_012.phpt
index 6262aa2c73..9824c63c40 100644
--- a/sapi/cli/tests/php_cli_server_012.phpt
+++ b/sapi/cli/tests/php_cli_server_012.phpt
@@ -7,8 +7,8 @@ include "skipif.inc";
--FILE--
<?php
include "php_cli_server.inc";
-php_cli_server_start('print_r($_REQUEST); $_REQUEST["foo"] = "bar"; return FALSE;');
-$doc_root = __DIR__;
+$info = php_cli_server_start('print_r($_REQUEST); $_REQUEST["foo"] = "bar"; return FALSE;');
+$doc_root = $info->docRoot;
file_put_contents($doc_root . '/request.php', '<?php print_r($_REQUEST); ?>');
$host = PHP_CLI_SERVER_HOSTNAME;
diff --git a/sapi/cli/tests/php_cli_server_015.phpt b/sapi/cli/tests/php_cli_server_015.phpt
index af48758306..5821fdbbc2 100644
--- a/sapi/cli/tests/php_cli_server_015.phpt
+++ b/sapi/cli/tests/php_cli_server_015.phpt
@@ -9,10 +9,9 @@ display_errors=1
--FILE--
<?php
include "php_cli_server.inc";
-php_cli_server_start('require("syntax_error.php");');
-$dir = realpath(__DIR__);
+$doc_root = php_cli_server_start('require("syntax_error.php");')->docRoot;
-file_put_contents($dir . "/syntax_error.php", "<?php non_exists_function(); ?>");
+file_put_contents($doc_root . "/syntax_error.php", "<?php non_exists_function(); ?>");
$output = '';
$host = PHP_CLI_SERVER_HOSTNAME;
@@ -30,7 +29,7 @@ HEADER
}
}
echo $output;
-@unlink($dir . "/syntax_error.php");
+@unlink($doc_root . "/syntax_error.php");
fclose($fp);
?>
--EXPECTF--
View Lorry Controller Status