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 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) 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