diff options
| author | Xinchen Hui <laruence@php.net> | 2011-08-22 11:55:41 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2011-08-22 11:55:41 +0000 |
| commit | ef0e483bb30cf52fb75277ab7c7aef0b64a0e1aa (patch) | |
| tree | 5e3be51c3714b43d928daf47c1013b82bd8a1359 /sapi/cli/php_cli_server.c | |
| parent | ee96b2df8fcbe97254c731c6aac5bd4a1db3167b (diff) | |
| download | php-git-ef0e483bb30cf52fb75277ab7c7aef0b64a0e1aa.tar.gz | |
Fixed #55463 (cli-server missing _SERVER[REMOTE_ADDR])
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 14 |
1 files changed, 14 insertions, 0 deletions
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); |