archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0' into PHP-8.1

Browse source
This commit is contained in:
David Carlier 2022-07-14 12:13:21 +01:00
commit b44a17c02a
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sapi/cli/php_cli_server.c
View file

@ -2296,7 +2296,7 @@ static void php_cli_server_dtor(php_cli_server *server) /* {{{ */
!WIFSIGNALED(php_cli_server_worker_status));
}
free(php_cli_server_workers);
pefree(php_cli_server_workers, 1);
}
#endif
} /* }}} */
@ -2382,12 +2382,8 @@ static void php_cli_server_startup_workers(void) {
if (php_cli_server_workers_max > 1) {
zend_long php_cli_server_worker;
php_cli_server_workers = calloc(
php_cli_server_workers_max, sizeof(pid_t));
if (!php_cli_server_workers) {
php_cli_server_workers_max = 1;
return;
}
php_cli_server_workers = pecalloc(
php_cli_server_workers_max, sizeof(pid_t), 1);
php_cli_server_master = getpid();