Use FPM TCP port where available

virtualmin · Feb 27, 2017 · b3cbbb1 · b3cbbb1
1 parent 2fc4c17
commit b3cbbb1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/virtual_feature.pl b/virtual_feature.pl
@@ -1034,13 +1034,17 @@ sub feature_get_web_php_mode
 my @locs = &find("location", $server);
 my ($loc) = grep { $_->{'words'}->[0] eq '~' &&
 		   $_->{'words'}->[1] eq '\.php$' } @locs;
-my $fpmsock = &virtual_server::get_php_fpm_socket_file($d);
+my $fpmsock = &virtual_server::get_php_fpm_socket_file($d, 1);
+my $fpmport = $d->{'php_fpm_port'};
 if ($loc) {
 	my ($pass) = &find("fastcgi_pass", $loc);
 	if ($pass && $pass->{'words'}->[0] =~ /^(localhost|unix):(.*)$/) {
 		if ($1 eq "unix" && $2 eq $fpmsock) {
 			return 'fpm';
 			}
+		elsif ($1 eq "localhost" && $fpmport && $2 eq $fpmport) {
+			return 'fpm';
+			}
 		else {
 			return 'fcgid';
 			}
@@ -1076,7 +1080,8 @@ sub feature_save_web_php_mode
 elsif ($mode eq "fpm" && $oldmode ne "fpm") {
 	# Setup FPM pool
 	&virtual_server::create_php_fpm_pool($d);
-	$port = &virtual_server::get_php_fpm_socket_file($d);
+	$port = $d->{'php_fpm_port'} ||
+		&virtual_server::get_php_fpm_socket_file($d);
 	}
 
 # Update the port in the config, if changed