com php-src: Fixed bug #77722: NEWS sapi/cli/php_cli_server .c
| From: | Nikita Popov | Date: | Tue, 12 Mar 2019 08:58:09 +0000 |
| Subject: | com php-src: Fixed bug #77722: NEWS sapi/cli/php_cli_server .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105098@lists.php.net to get a copy of this message | ||
Commit: a7739be22f8b376c58d666caa4479005e14bc2fa
Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 12 Mar 2019 09:57:51 +0100
Parents: 95c8f67a4c678b1fb26dbd2c7b57b14ea46c8ae0
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a7739be22f8b376c58d666caa4479005e14bc2fa
Log:
Fixed bug #77722
Bugs:
https://bugs.php.net/77722
Changed paths:
M NEWS
M sapi/cli/php_cli_server.c
Diff:
diff --git a/NEWS b/NEWS
index 6af06b1..dc4bb61 100644
--- a/NEWS
+++ b/NEWS
@@ -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 5386aa5..b324958 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 {