Commit d84f463

committed

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix GH-19461: Improve error message on listening error with IPv6 (#19462)

2 parents 578783b + a41cb62 commit d84f463Copy full SHA for d84f463

File tree

+90

-1

lines changed

+90

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@ PHP NEWS`
`13`	`13`	`. Fixed bug GH-19679 (zend_ssa_range_widening may fail to converge). (Arnaud)`
`14`	`14`	`. Fixed bug GH-19681 (PHP_EXPAND_PATH broken with bash 5.3.0). (Remi)`
`15`	`15`
	`16`	`+- CLI:`
	`17`	`+ . Fixed bug GH-19461 (Improve error message on listening error with IPv6`
	`18`	`+ address). (alexandre-daubois)`
	`19`	`+`
`16`	`20`	`- Date:`
`17`	`21`	`. Fixed date_sunrise() and date_sunset() with partial-hour UTC offset.`
`18`	`22`	`(ilutov)`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2562,7 +2562,11 @@ static zend_result php_cli_server_ctor(php_cli_server server, const char addr,`
`2562`	`2562`
`2563`	`2563`	`server_sock = php_network_listen_socket(host, &port, SOCK_STREAM, &server->address_family, &server->socklen, &errstr);`
`2564`	`2564`	`if (server_sock == SOCK_ERR) {`
`2565`		`- php_cli_server_logf(PHP_CLI_SERVER_LOG_ERROR, "Failed to listen on %s:%d (reason: %s)", host, port, errstr ? ZSTR_VAL(errstr) : "?");`
	`2565`	`+ if (strchr(host, ':')) {`
	`2566`	`+ php_cli_server_logf(PHP_CLI_SERVER_LOG_ERROR, "Failed to listen on [%s]:%d (reason: %s)", host, port, errstr ? ZSTR_VAL(errstr) : "?");`
	`2567`	`+ } else {`
	`2568`	`+ php_cli_server_logf(PHP_CLI_SERVER_LOG_ERROR, "Failed to listen on %s:%d (reason: %s)", host, port, errstr ? ZSTR_VAL(errstr) : "?");`
	`2569`	`+ }`
`2566`	`2570`	`if (errstr) {`
`2567`	`2571`	`zend_string_release_ex(errstr, 0);`
`2568`	`2572`	`}`

Lines changed: 41 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,41 @@`
	`1`	`+--TEST--`
	`2`	`+IPv4 address error message formatting`
	`3`	`+--SKIPIF--`
	`4`	`+<?php`
	`5`	`+if (substr(PHP_OS, 0, 3) == 'WIN') {`
	`6`	`+ die("skip not for Windows");`
	`7`	`+}`
	`8`	`+?>`
	`9`	`+--FILE--`
	`10`	`+<?php`
	`11`	`+`
	`12`	`+$descriptorspec = array(`
	`13`	`+ 0 => array("pipe", "r"),`
	`14`	`+ 1 => array("pipe", "w"),`
	`15`	`+ 2 => array("pipe", "w")`
	`16`	`+);`
	`17`	`+`
	`18`	`+$process = proc_open(`
	`19`	`+ PHP_BINARY . ' -S "192.168.1.999:8080"',`
	`20`	`+ $descriptorspec,`
	`21`	`+ $pipes`
	`22`	`+);`
	`23`	`+`
	`24`	`+if (is_resource($process)) {`
	`25`	`+ usleep(100000);`
	`26`	`+`
	`27`	`+ $stderr = stream_get_contents($pipes[2]);`
	`28`	`+`
	`29`	`+ fclose($pipes[0]);`
	`30`	`+ fclose($pipes[1]);`
	`31`	`+ fclose($pipes[2]);`
	`32`	`+`
	`33`	`+ proc_terminate($process);`
	`34`	`+ proc_close($process);`
	`35`	`+`
	`36`	`+ var_dump($stderr);`
	`37`	`+}`
	`38`	`+?>`
	`39`	`+--EXPECTF--`
	`40`	`+string(%d) "[%s] Failed to listen on 192.168.1.999:8080 %s`
	`41`	`+"`

Lines changed: 40 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,40 @@`
	`1`	`+--TEST--`
	`2`	`+IPv6 address error message formatting`
	`3`	`+--SKIPIF--`
	`4`	`+<?php`
	`5`	`+if (substr(PHP_OS, 0, 3) == 'WIN') {`
	`6`	`+ die("skip not for Windows");`
	`7`	`+}`
	`8`	`+?>`
	`9`	`+--FILE--`
	`10`	`+<?php`
	`11`	`+$descriptorspec = array(`
	`12`	`+ 0 => array("pipe", "r"),`
	`13`	`+ 1 => array("pipe", "w"),`
	`14`	`+ 2 => array("pipe", "w")`
	`15`	`+);`
	`16`	`+`
	`17`	`+$process = proc_open(`
	`18`	`+ PHP_BINARY . ' -S "[2001:db8::]:8080"',`
	`19`	`+ $descriptorspec,`
	`20`	`+ $pipes`
	`21`	`+);`
	`22`	`+`
	`23`	`+if (is_resource($process)) {`
	`24`	`+ usleep(100000);`
	`25`	`+`
	`26`	`+ $stderr = stream_get_contents($pipes[2]);`
	`27`	`+`
	`28`	`+ fclose($pipes[0]);`
	`29`	`+ fclose($pipes[1]);`
	`30`	`+ fclose($pipes[2]);`
	`31`	`+`
	`32`	`+ proc_terminate($process);`
	`33`	`+ proc_close($process);`
	`34`	`+`
	`35`	`+ var_dump($stderr);`
	`36`	`+}`
	`37`	`+?>`
	`38`	`+--EXPECTF--`
	`39`	`+string(%d) "[%s] Failed to listen on [2001:db8::]:8080 %s`
	`40`	`+"`

Comments

(0)