summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorPierrick Charron <pierrick@php.net>2011-11-18 06:15:25 +0000
committerPierrick Charron <pierrick@php.net>2011-11-18 06:15:25 +0000
commit5020d4a5cf910978c490fb114dce271808ab018b (patch)
tree54244772ec2d165581e3cf493047305ad1cfde98 /sapi
parent3b40dabc8cfed3bba51251be2fcf4659eaaa2ce5 (diff)
downloadphp-git-5020d4a5cf910978c490fb114dce271808ab018b.tar.gz
Don't load php.ini file to test the built-in web server
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cli/tests/php_cli_server.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc
index ab754eb408..60ae3254db 100644
--- a/sapi/cli/tests/php_cli_server.inc
+++ b/sapi/cli/tests/php_cli_server.inc
@@ -16,14 +16,14 @@ function php_cli_server_start($code = 'echo "Hello world";', $no_router = FALSE)
);
if (substr(PHP_OS, 0, 3) == 'WIN') {
- $cmd = "{$php_executable} -t {$doc_root} -S " . PHP_CLI_SERVER_ADDRESS;
+ $cmd = "{$php_executable} -t {$doc_root} -n -S " . PHP_CLI_SERVER_ADDRESS;
if (!$no_router) {
$cmd .= " {$router}";
}
$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} -S " . PHP_CLI_SERVER_ADDRESS;
+ $cmd = "exec {$php_executable} -t {$doc_root} -n -S " . PHP_CLI_SERVER_ADDRESS;
if (!$no_router) {
$cmd .= " {$router}";
}