diff options
| author | Xinchen Hui <laruence@php.net> | 2011-12-09 16:16:31 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2011-12-09 16:16:31 +0000 |
| commit | e29c46a50dbb6b42a8a278ea0ce288d14115fcbc (patch) | |
| tree | 12d508c7eca84842f7865d1b34a6d0ee56590f05 | |
| parent | 8fff0e86d7d34af365bdbac6b10aae2a496b4afd (diff) | |
| download | php-git-e29c46a50dbb6b42a8a278ea0ce288d14115fcbc.tar.gz | |
add $_SERVER["SERVER_NAME"] since it's handy
| -rw-r--r-- | sapi/cli/php_cli_server.c | 1 | ||||
| -rw-r--r-- | sapi/cli/tests/php_cli_server_002.phpt | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index cd57eeecae..33c37a309b 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -577,6 +577,7 @@ static void sapi_cli_server_register_variables(zval *track_vars_array TSRMLS_DC) sapi_cli_server_register_variable(track_vars_array, "SERVER_PROTOCOL", tmp TSRMLS_CC); efree(tmp); } + sapi_cli_server_register_variable(track_vars_array, "SERVER_NAME", client->server->host TSRMLS_CC); { char *tmp; spprintf(&tmp, 0, "%i", client->server->port); diff --git a/sapi/cli/tests/php_cli_server_002.phpt b/sapi/cli/tests/php_cli_server_002.phpt index 8b8bc94757..93151c15d4 100644 --- a/sapi/cli/tests/php_cli_server_002.phpt +++ b/sapi/cli/tests/php_cli_server_002.phpt @@ -9,10 +9,12 @@ include "skipif.inc"; --FILE-- <?php include "php_cli_server.inc"; -php_cli_server_start('var_dump($_SERVER["DOCUMENT_ROOT"], $_SERVER["SERVER_SOFTWARE"]);'); +php_cli_server_start('var_dump($_SERVER["DOCUMENT_ROOT"], $_SERVER["SERVER_SOFTWARE"], $_SERVER["SERVER_NAME"], $_SERVER["SERVER_PORT"]);'); var_dump(file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS)); ?> --EXPECTF-- string(%d) "string(%d) "%stests" string(%d) "PHP %s Development Server" +string(%d) "localhost" +string(%d) "8964" " |