From 800ac30ecefea5213aa9172de1f5388154b7690a Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 07 Feb 2013 08:17:02 -0500
Subject: [PATCH] - Remove trailing slash from $master_php_ini_path. - Make sure $custom_fastcgi_php_ini_dir is a directory.
---
server/plugins-available/apache2_plugin.inc.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index ed8a371..3181952 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -837,6 +837,7 @@
//* Add php.ini to the path in case that the master_php_ini_path is a directory
if($master_php_ini_path != '' && is_dir($master_php_ini_path) && is_file($master_php_ini_path.'/php.ini')) {
+ if(substr($master_php_ini_path,-1) == '/') $master_php_ini_path = substr($master_php_ini_path,0,-1);
$master_php_ini_path .= '/php.ini';
}
@@ -1126,6 +1127,7 @@
if(trim($data['new']['fastcgi_php_version']) != ''){
$default_fastcgi_php = false;
list($custom_fastcgi_php_name, $custom_fastcgi_php_executable, $custom_fastcgi_php_ini_dir) = explode(':', trim($data['new']['fastcgi_php_version']));
+ if(is_file($custom_fastcgi_php_ini_dir)) $custom_fastcgi_php_ini_dir = dirname($custom_fastcgi_php_ini_dir);
if(substr($custom_fastcgi_php_ini_dir,-1) != '/') $custom_fastcgi_php_ini_dir .= '/';
} else {
$default_fastcgi_php = true;
--
Gitblit v1.9.1