From: Xinchen Hui <laruence@php.net>
Date: Fri, 9 Dec 2011 16:16:31 +0000 (+0000)
Subject: add $_SERVER["SERVER_NAME"] since it's handy
X-Git-Tag: php-5.4.0RC4~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e29c46a50dbb6b42a8a278ea0ce288d14115fcbc;p=php

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 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"
 "