[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_cli_server.c branches/PHP_5_4/sapi/cli/tests/php_cli_server_002.phpt trunk/sapi/cli/php_cli_server.c trunk/sapi/cli/tests/php_cli_server_002.phpt

[Xinchen Hui]

laruence                                 Fri, 09 Dec 2011 16:16:31 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=320796

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

Changed paths:
    U   php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
    U   php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_002.phpt
    U   php/php-src/trunk/sapi/cli/php_cli_server.c
    U   php/php-src/trunk/sapi/cli/tests/php_cli_server_002.phpt

Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c      2011-12-09 
16:10:33 UTC (rev 320795)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c      2011-12-09 
16:16:31 UTC (rev 320796)
@@ -577,6 +577,7 @@
                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);

Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_002.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_002.phpt 
2011-12-09 16:10:33 UTC (rev 320795)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/php_cli_server_002.phpt 
2011-12-09 16:16:31 UTC (rev 320796)
@@ -9,10 +9,12 @@
 --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"
 "

Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-12-09 16:10:33 UTC (rev 
320795)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-12-09 16:16:31 UTC (rev 
320796)
@@ -577,6 +577,7 @@
                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);

Modified: php/php-src/trunk/sapi/cli/tests/php_cli_server_002.phpt
===================================================================
--- php/php-src/trunk/sapi/cli/tests/php_cli_server_002.phpt    2011-12-09 
16:10:33 UTC (rev 320795)
+++ php/php-src/trunk/sapi/cli/tests/php_cli_server_002.phpt    2011-12-09 
16:16:31 UTC (rev 320796)
@@ -9,10 +9,12 @@
 --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"
 "


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php