add $_SERVER["SERVER_NAME"] since it's handy

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index cd57eeecae1408619fbdc621efdee81bf0a52018..33c37a309bb30180f1cc710fe4ec1323c7482a09 100644 (file)
--- 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 8b8bc9475755afb7458662c9084d8df2bbc6f6fd..93151c15d47f4cfd4e84324950870f9c69d10e43 100644 (file)
--- 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"
 "