Skip to content

Commit e59bb82

Browse files
author
Till Brehm
committed
Fixed Open Issue #3789 php-fpm reload workaround targeted at Ubuntu 14.04 breaks newer/fixed PHP packages on Ubuntu 14.04
1 parent 077c4a5 commit e59bb82

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

server/mods-available/web_module.inc.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ function restartPHP_FPM($action = 'restart') {
265265
// @see: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1242376
266266
if(file_exists('/etc/os-release')) {
267267
$tmp = file_get_contents('/etc/os-release');
268-
if(preg_match('/^ID=ubuntu/m', $tmp) && preg_match('/^VERSION_ID="14\.04"/m', $tmp)) {
268+
//if(preg_match('/^ID=ubuntu/m', $tmp) && preg_match('/^VERSION_ID="14\.04"/m', $tmp)) {
269+
if(preg_match('/^ID=ubuntu/m', $tmp) && preg_match('/^VERSION_ID="14\.04"/m', $tmp) && stristr(phpversion(), 'deb.sury.org') === false) {
269270
$initcommand = '/sbin/start-stop-daemon --stop --signal USR2 --quiet --pidfile /var/run/php5-fpm.pid --name php5-fpm';
270271
}
271272
// And the next workaround, php-fpm reloads in centos 7 downt work as well.

0 commit comments

Comments
 (0)