Skip to content

Commit a35a003

Browse files
author
Till Brehm
committed
#4701 Removed workaround that disabled socket for php-fpm
1 parent f14c929 commit a35a003

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

server/plugins-available/apache2_plugin.inc.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,10 +1512,7 @@ function update($event_name, $data) {
15121512
$socket_dir = escapeshellcmd($web_config['php_fpm_socket_dir']);
15131513
if(substr($socket_dir, -1) != '/') $socket_dir .= '/';
15141514

1515-
$apache_modules = $app->system->getapachemodules();
1516-
1517-
// Use sockets, but not with apache 2.4 on centos (mod_proxy_fcgi) as socket support is buggy in that version
1518-
if($data['new']['php_fpm_use_socket'] == 'y' && in_array('fastcgi_module',$apache_modules)){
1515+
if($data['new']['php_fpm_use_socket'] == 'y'){
15191516
$use_tcp = 0;
15201517
$use_socket = 1;
15211518
} else {
@@ -3001,10 +2998,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
30012998
$tpl->newTemplate('php_fpm_pool.conf.master');
30022999
$tpl->setVar('apache_version', $app->system->getapacheversion());
30033000

3004-
$apache_modules = $app->system->getapachemodules();
3005-
3006-
// Use sockets, but not with apache 2.4 on centos (mod_proxy_fcgi) as socket support is buggy in that version
3007-
if($data['new']['php_fpm_use_socket'] == 'y' && in_array('fastcgi_module',$apache_modules)){
3001+
if($data['new']['php_fpm_use_socket'] == 'y'){
30083002
$use_tcp = 0;
30093003
$use_socket = 1;
30103004
if(!is_dir($socket_dir)) $app->system->mkdirpath($socket_dir);

0 commit comments

Comments
 (0)