Skip to content

Fix ASAN reported leak in FPM config test #10296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix ASAN reported leak in FPM config test #10296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sapi/fpm/fpm/fpm_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1798,7 +1798,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]) {
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug68591-conf-test-group.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ $cfg = <<<EOT
error_log = {{FILE:LOG}}
[unconfined]
listen = {{ADDR:UDS}}
user = root
group = aaaaaa
pm = dynamic
pm.max_children = 5
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug68591-conf-test-listen-group.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down