From 1cdec443278a326d8a65850d59853fda51652f33 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 26 Oct 2010 10:52:14 -0400
Subject: [PATCH] Fixed: FS#1386 - Wrong master php.ini used in fcgi mode with custom config
---
server/plugins-available/apache2_plugin.inc.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 5ba9add..220d0cd 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -553,7 +553,11 @@
if($data["new"]['php'] == 'mod') {
$master_php_ini_path = $web_config['php_ini_path_apache'];
} else {
- $master_php_ini_path = $web_config['php_ini_path_cgi'];
+ if($data["new"]['php'] == 'fast-cgi' && file_exists($fastcgi_config["fastcgi_phpini_path"])) {
+ $master_php_ini_path = $fastcgi_config["fastcgi_phpini_path"];
+ } else {
+ $master_php_ini_path = $web_config['php_ini_path_cgi'];
+ }
}
if($master_php_ini_path != '' && substr($master_php_ini_path,-7) == 'php.ini' && is_file($master_php_ini_path)) {
$php_ini_content .= file_get_contents($master_php_ini_path)."\n";
--
Gitblit v1.9.1