From e00939dc241cbec53f1ffcfd47563f7e6b7a4e6f Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sun, 6 Feb 2022 13:35:52 -0800
Subject: [PATCH] Use a better function to map the config file to the pool
 directory

---
 phpini/phpini-lib.pl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/phpini/phpini-lib.pl b/phpini/phpini-lib.pl
index 65db08109..bc8948e19 100755
--- a/phpini/phpini-lib.pl
+++ b/phpini/phpini-lib.pl
@@ -295,10 +295,12 @@ if ($file && &get_config_fmt($file) eq "fpm" &&
 		my $conf;
 		if (-r $file) {
 			my @conf;
-			@conf = grep { $file =~ /\Q$_->{'dir'}\E/ }
-				&virtual_server::list_php_fpm_configs();
-			$conf =
-				&virtual_server::get_php_fpm_config($conf[0]->{'shortversion'});
+			@conf = grep { &is_under_directory($_->{'dir'}, $file) }
+				     &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();