From ef0e483bb30cf52fb75277ab7c7aef0b64a0e1aa Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 22 Aug 2011 11:55:41 +0000 Subject: [PATCH] Fixed #55463 (cli-server missing _SERVER[REMOTE_ADDR]) --- NEWS | 1 + sapi/cli/php_cli_server.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/NEWS b/NEWS index 17a79cba27..9f6f53e2a6 100644 --- a/NEWS +++ b/NEWS @@ -324,6 +324,7 @@ PHP NEWS - Fixed bug #52211 (iconv() returns part of string on error). (Felipe) - Fixed bug #55450 (Built in web server not accepting file uploads). (Laruence) - Fixed bug #55471 (ZTS build broken with dtrace). (Laruence) +- Fixed bug #55463 (cli-server missing _SERVER[REMOTE_ADDR]). (Laruence) 28 Jul 2011, PHP 5.3.7 RC4 - Improved core functions: diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 71d83e9051..eefe2a1316 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -496,6 +496,20 @@ static void sapi_cli_server_register_variables(zval *track_vars_array TSRMLS_DC) sapi_cli_server_register_variable(track_vars_array, "HTTP_REFERER", *val TSRMLS_CC); } } + { + char *tmp; + if ((tmp = strrchr(client->addr_str, ':'))) { + char addr[64], port[8]; + strncpy(port, tmp + 1, 8); + port[7] = '\0'; + strncpy(addr, client->addr_str, tmp - client->addr_str); + addr[tmp - client->addr_str] = '\0'; + sapi_cli_server_register_variable(track_vars_array, "REMOTE_ADDR", addr TSRMLS_CC); + sapi_cli_server_register_variable(track_vars_array, "REMOTE_PORT", port TSRMLS_CC); + } else { + sapi_cli_server_register_variable(track_vars_array, "REMOTE_ADDR", client->addr_str TSRMLS_CC); + } + } sapi_cli_server_register_variable(track_vars_array, "REQUEST_URI", client->request.request_uri TSRMLS_CC); sapi_cli_server_register_variable(track_vars_array, "REQUEST_METHOD", SG(request_info).request_method TSRMLS_CC); sapi_cli_server_register_variable(track_vars_array, "PHP_SELF", client->request.vpath TSRMLS_CC); -- 2.40.0