VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-21 23:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

We may be editing a global php.ini even when the server is in FPM mode

Browse Source
This commit is contained in:
Jamie Cameron
2025-02-09 22:08:50 -08:00
parent b4725ac9ef
commit eda9723aaa
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpini/phpini-lib.pl
View File

@ -498,22 +498,18 @@ if (&foreign_installed("apache")) {
&reset_environment();
}
}
if ($file && &get_config_fmt($file) eq "fpm" &&
&foreign_check("virtual-server")) {
if ($file && -r $file && &foreign_check("virtual-server")) {
# Looks like FPM format ... maybe a pool restart is needed
&foreign_require("virtual-server");
if (defined(&virtual_server::restart_php_fpm_server)) {
my $conf;
if (-r $file) {
my @conf;
my $filedir = $file;
$filedir =~ s/\/[^\/]+$//;
@conf = grep { &is_under_directory($_->{'dir'}, $filedir) }
&virtual_server::list_php_fpm_configs();
if (@conf) {
$conf = &virtual_server::get_php_fpm_config(
$conf[0]->{'shortversion'});
}
my $filedir = $file;
$filedir =~ s/\/[^\/]+$//;
my @conf = grep { &is_under_directory($_->{'dir'}, $filedir) }
&virtual_server::list_php_fpm_configs();
if (@conf) {
$conf = &virtual_server::get_php_fpm_config(
$conf[0]->{'shortversion'});
}
&virtual_server::push_all_print();
&virtual_server::set_all_null_print();