Skip to content

Commit 0ec330d

Browse files
committed
Fix to correctly set PHP version in FCGI mode
1 parent 65fd34b commit 0ec330d

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

virtual_feature.pl

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,18 +1427,10 @@ sub feature_save_web_php_directory
14271427
# Assume this is FCGId mode
14281428

14291429
# Get the current version
1430-
my $phpcmd = &find_php_fcgi_server($d);
1431-
my $defver;
1432-
if ($phpcmd) {
1433-
foreach my $vers (@avail) {
1434-
if ($vers->[1] && $vers->[1] eq $phpcmd) {
1435-
$defver = $vers->[0];
1436-
}
1437-
}
1438-
}
1439-
1430+
my @dirs = &virtual_server::list_domain_php_directories($d);
1431+
my $phpver_curr = $dirs[0]->{'version'};
14401432
# Change if needed
1441-
if ($defver && $defver ne $ver || !$d->{'nginx_php_version'}) {
1433+
if (!$phpver_curr || $phpver_curr ne $ver || !$d->{'nginx_php_version'}) {
14421434
$d->{'nginx_php_version'} = $ver;
14431435
&virtual_server::save_domain($d);
14441436
&delete_php_fcgi_server($d);

0 commit comments

Comments
 (0)