diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-12 09:57:51 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-12 09:58:09 +0100 |
| commit | a7739be22f8b376c58d666caa4479005e14bc2fa (patch) | |
| tree | 45b11b175f3d21c6c568f8bccd74ff6b034c3f02 | |
| parent | 95c8f67a4c678b1fb26dbd2c7b57b14ea46c8ae0 (diff) | |
| download | php-git-a7739be22f8b376c58d666caa4479005e14bc2fa.tar.gz | |
Fixed bug #77722
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.c | 8 |
2 files changed, 10 insertions, 2 deletions
@@ -9,6 +9,10 @@ PHP NEWS . Fixed bug #77345 (Stack Overflow caused by circular reference in garbage collection). (Alexandru Patranescu, Nikita, Dmitry) +- CLI Server: + . Fixed bug #77722 (Incorrect IP set to $_SERVER['REMOTE_ADDR'] on the + localhost). (Nikita) + - Apache2Handler: . Fixed bug #77648 (BOM in sapi/apache2handler/php_functions.c). (cmb) diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 5386aa54c6..b324958052 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -637,10 +637,14 @@ static void sapi_cli_server_register_variables(zval *track_vars_array) /* {{{ */ char *tmp; if ((tmp = strrchr(client->addr_str, ':'))) { char addr[64], port[8]; + const char *addr_start = client->addr_str, *addr_end = tmp; + if (addr_start[0] == '[') addr_start++; + if (addr_end[-1] == ']') addr_end--; + strncpy(port, tmp + 1, 8); port[7] = '\0'; - strncpy(addr, client->addr_str, tmp - client->addr_str); - addr[tmp - client->addr_str] = '\0'; + strncpy(addr, addr_start, addr_end - addr_start); + addr[addr_end - addr_start] = '\0'; sapi_cli_server_register_variable(track_vars_array, "REMOTE_ADDR", addr); sapi_cli_server_register_variable(track_vars_array, "REMOTE_PORT", port); } else { |