svn: /php/php-src/ branches/PHP_5_4/sapi/cli/tests/php_cli_server.inc trunk/sapi/cli/tests/php_cli_server.inc
| From: | Pierrick Charron | Date: | Fri, 18 Nov 2011 06:15:25 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/sapi/cli/tests/php_cli_server.inc trunk/sapi/cli/tests/php_cli_server.inc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67027@lists.php.net to get a copy of this message | ||
pierrick Fri, 18 Nov 2011 06:15:25 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319436
Log:
Don't load php.ini file to test the built-in web server
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server.inc
U php/php-src/trunk/sapi/cli/tests/php_cli_server.inc
Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server.inc
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server.inc 2011-11-18 06:15:23 UTC (rev
319435)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server.inc 2011-11-18 06:15:25 UTC (rev
319436)
@@ -16,14 +16,14 @@
);
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}";
}
Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server.inc
===================================================================
--- php/php-src/trunk/sapi/cli/tests/php_cli_server.inc 2011-11-18 06:15:23 UTC (rev 319435)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server.inc 2011-11-18 06:15:25 UTC (rev 319436)
@@ -16,14 +16,14 @@
);
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}";
}