mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source
This commit is contained in:
Jakub Zelenka 2023-01-12 13:55:47 +00:00
commit da4775f071
No known key found for this signature in database
GPG Key ID: 1C0779DC5C0A9DE4
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sapi/fpm/fpm/fpm_main.c
View File

@ -1801,7 +1801,8 @@ consult the installation file that came with this distribution, or visit \n\
zend_quiet_write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval));
close(fpm_globals.send_config_pipe[1]);
}
return FPM_EXIT_CONFIG;
exit_status = FPM_EXIT_CONFIG;
goto out;
}
if (fpm_globals.send_config_pipe[1]) {

1
sapi/fpm/tests/bug68591-conf-test-group.phpt
View File

@ -14,6 +14,7 @@ $cfg = <<<EOT
error_log = {{FILE:LOG}}
[unconfined]
listen = {{ADDR:UDS}}
user = root
group = aaaaaa
pm = dynamic
pm.max_children = 5

1
sapi/fpm/tests/bug68591-conf-test-listen-group.phpt
View File

@ -15,6 +15,7 @@ error_log = {{FILE:LOG}}
[unconfined]
listen = {{ADDR:UDS}}
listen.group = aaaaaa
user = root
pm = dynamic
pm.max_children = 5
pm.start_servers = 2

1
sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt
View File

@ -15,6 +15,7 @@ error_log = {{FILE:LOG}}
[unconfined]
listen = {{ADDR:UDS}}
listen.owner = aaaaaa
user = root
pm = dynamic
pm.max_children = 5
pm.start_servers = 2