michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix PHP detection from the path to work for all supported distros

Browse Source
This commit is contained in:
iliajie
2023-07-16 13:09:19 +03:00
parent f7dc0add11
commit deb172ca82
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpini/phpini-lib.pl
View File

@@ -305,13 +305,13 @@ if (&foreign_check("virtual-server")) {
}
}
# Try to get version from the path
if ($file =~ /php(\d+)/) {
# Try to get version from the path, e.g.
# RHEL and derivatives /etc/opt/remi/php83
# Debian/Ubuntu /etc/php/8.3/fpm/pool.d/www.conf
# RHEL and derivatives Debian/Ubuntu
if ($file =~ /php(\d+)/ || $file =~ /php\/([\d\.]+)/) {
my $ver = $1;
my $nodot = $ver;
$nodot =~ s/\.//g;
my $binary = &has_command("php$ver") ||
&has_command("php$nodot");
my $binary = &has_command("php$ver");
return $binary if ($binary);
}
return &has_command("php");