From 1e67c170df357c0d0831d223e93a6512d84c523e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 27 Oct 2014 15:46:52 -0400
Subject: [PATCH] - Fixed hanging update on ubuntu 14.10 caused by mysql restart script. - Fixed: FS#3710 - Bug with PHP-FPM configuration since 3.0.5.4 Patch 4 - Fixed wrong function calls in system lib.
---
server/plugins-available/apache2_plugin.inc.php | 6 ++++--
install/update.php | 2 +-
server/lib/classes/system.inc.php | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/install/update.php b/install/update.php
index 803e47d..0e8f6bd 100644
--- a/install/update.php
+++ b/install/update.php
@@ -456,7 +456,7 @@
//** Restart services:
if($reconfigure_services_answer == 'yes') {
swriteln('Restarting services ...');
- if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart'));
+ if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart').' >/dev/null 2>&1');
if($conf['services']['mail']) {
if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index aadfbf3..b92cae5 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -1765,8 +1765,8 @@
global $app;
$cmd = '';
- if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
- elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
+ if($this->is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
+ elseif($this->is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
else {
$app->log("Could not check apache modules, apachectl not found.", LOGLEVEL_WARN);
return array();
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 7c1903a..969851d 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1275,8 +1275,10 @@
$socket_dir = escapeshellcmd($web_config['php_fpm_socket_dir']);
if(substr($socket_dir, -1) != '/') $socket_dir .= '/';
- // User sockets, but not with apache 2.4 as socket support is buggy in that version
- if($data['new']['php_fpm_use_socket'] == 'y' && $app->system->getapacheversion() < 2.4){
+ $apache_modules = $app->system->getapachemodules();
+
+ // Use sockets, but not with apache 2.4 on centos (mod_proxy_fcgi) as socket support is buggy in that version
+ if($data['new']['php_fpm_use_socket'] == 'y' && in_array('fastcgi_module',$apache_modules)){
$use_tcp = 0;
$use_socket = 1;
} else {
--
Gitblit v1.9.1