Skip to content

Commit 9dba8d7

Browse files
author
Marius Cramer
committed
Fix for previous commit
1 parent 1050bda commit 9dba8d7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

server/mods-available/web_module.inc.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,9 @@ function restartPHP_FPM($action = 'restart') {
236236
$path_parts = pathinfo($init_script);
237237
$initcommand = $app->system->getinitcommand($path_parts['basename'], $action, $path_parts['dirname']);
238238

239-
if($action == 'reload') {
239+
if($action == 'reload' && $init_script == $conf['init_scripts'].'/'.$web_config['php_fpm_init_script']) {
240+
// we have to do a workaround because of buggy ubuntu fpm reload handling
241+
// @see: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1242376
240242
if(file_exists('/etc/os-release')) {
241243
$tmp = file_get_contents('/etc/os-release');
242244
if(preg_match('/^ID=ubuntu/m', $tmp) && preg_match('/^VERSION_ID="14\.04"/m', $tmp)) {
@@ -245,7 +247,6 @@ function restartPHP_FPM($action = 'restart') {
245247
unset($tmp);
246248
}
247249
}
248-
249250
}
250251

251252
$retval = array('output' => '', 'retval' => 0);

0 commit comments

Comments
 (0)