From 30a3c3c05236dac3157402b2b1f24369d50df6b2 Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Sun, 6 Feb 2022 20:35:29 +0300 Subject: [PATCH 1/2] Fix to restart correct PHP-FPM service --- phpini/phpini-lib.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/phpini/phpini-lib.pl b/phpini/phpini-lib.pl index fdaf0467b..8d0ede6ab 100755 --- a/phpini/phpini-lib.pl +++ b/phpini/phpini-lib.pl @@ -292,9 +292,17 @@ if ($file && &get_config_fmt($file) eq "fpm" && # 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; + @conf = grep { $file =~ /$_->{'dir'}/ } + &virtual_server::list_php_fpm_configs(); + $conf = + &virtual_server::get_php_fpm_config($conf[0]->{'shortversion'}); + } &virtual_server::push_all_print(); &virtual_server::set_all_null_print(); - &virtual_server::restart_php_fpm_server(); + &virtual_server::restart_php_fpm_server($conf); &virtual_server::pop_all_print(); } } From f774fe73b6348bb2b4ad739bd566a7777b2dbb10 Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Sun, 6 Feb 2022 20:39:54 +0300 Subject: [PATCH 2/2] Fix to quotemeta dir --- phpini/phpini-lib.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpini/phpini-lib.pl b/phpini/phpini-lib.pl index 8d0ede6ab..65db08109 100755 --- a/phpini/phpini-lib.pl +++ b/phpini/phpini-lib.pl @@ -295,7 +295,7 @@ if ($file && &get_config_fmt($file) eq "fpm" && my $conf; if (-r $file) { my @conf; - @conf = grep { $file =~ /$_->{'dir'}/ } + @conf = grep { $file =~ /\Q$_->{'dir'}\E/ } &virtual_server::list_php_fpm_configs(); $conf = &virtual_server::get_php_fpm_config($conf[0]->{'shortversion'});