Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
a35a0032
Commit
a35a0032
authored
Jul 13, 2017
by
Till Brehm
Browse files
#4701 Removed workaround that disabled socket for php-fpm
parent
f14c9296
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/plugins-available/apache2_plugin.inc.php
View file @
a35a0032
...
...
@@ -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
);
...
...
Michael Scholz
@mscholz
mentioned in issue
#4831 (closed)
·
Nov 09, 2017
mentioned in issue
#4831 (closed)
mentioned in issue #4831
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment