From a35a00324f4884047581e17ac50d1c5859b2adf8 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Thu, 13 Jul 2017 12:09:20 +0200 Subject: [PATCH] #4701 Removed workaround that disabled socket for php-fpm --- server/plugins-available/apache2_plugin.inc.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 3c29a3c52..5ff752bb3 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -1512,10 +1512,7 @@ class apache2_plugin { $socket_dir = escapeshellcmd($web_config['php_fpm_socket_dir']); if(substr($socket_dir, -1) != '/') $socket_dir .= '/'; - $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)){ + if($data['new']['php_fpm_use_socket'] == 'y'){ $use_tcp = 0; $use_socket = 1; } else { @@ -3001,10 +2998,7 @@ class apache2_plugin { $tpl->newTemplate('php_fpm_pool.conf.master'); $tpl->setVar('apache_version', $app->system->getapacheversion()); - $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)){ + if($data['new']['php_fpm_use_socket'] == 'y'){ $use_tcp = 0; $use_socket = 1; if(!is_dir($socket_dir)) $app->system->mkdirpath($socket_dir); -- GitLab