Fix back PHP MultiViews in FCGID mode #1036

Author: iliaross

functional-test.pl

@@ -564,6 +564,11 @@ package virtual_server;
 		       $test_domain_user.'/public_html/test.php',
 	},
 
+	# Enable content negotiation for extensionless PHP requests
+	{ 'command' => 'echo "Options +MultiViews" >~'.
+		       $test_domain_user.'/public_html/.htaccess',
+	},
+
 	# Create a test sub-directory
 	{ 'command' => 'su -s /bin/sh '.$test_domain_user.' -c "mkdir ~/public_html/foo"',
 	},
@@ -665,6 +670,12 @@ package virtual_server;
 			      'cgi-fcgi' ],
 		},
 
+		# Check PHP running via fCGId through MultiViews
+		{ 'command' => $wget_command.'http://'.$test_domain.'/test',
+		  'grep' => [ 'uid=[0-9]+\\('.$test_domain_user.'\\)',
+			      'cgi-fcgi' ],
+		},
+
 		# Set the PHP version for a sub-directory
 		{ 'command' => 'set-php-directory.pl',
 		  'args' => [ [ 'domain' => $test_domain ],

php-lib.pl

@@ -412,7 +412,9 @@ sub save_domain_php_mode
 		if ($mode eq "cgi") {
 			push(@types, "application/x-httpd-php$ver .php");
 			}
-		elsif ($mode eq "mod_php") {
+		# Keep a MIME type for MultiViews; execution is still selected by
+		# the mode-specific handler or wrapper configured above.
+		elsif ($mode eq "mod_php" || $mode eq "fcgid") {
 			push(@types, "application/x-httpd-php .php");
 			}
 		@types = &unique(@types);