From 9dba8d7cecd64cc89e006d57f1d39d7ca9119645 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 23 Apr 2014 09:33:54 -0400
Subject: [PATCH] Fix for previous commit
---
server/mods-available/web_module.inc.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index 6b4851a..c31aa67 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -236,7 +236,9 @@
$path_parts = pathinfo($init_script);
$initcommand = $app->system->getinitcommand($path_parts['basename'], $action, $path_parts['dirname']);
- if($action == 'reload') {
+ if($action == 'reload' && $init_script == $conf['init_scripts'].'/'.$web_config['php_fpm_init_script']) {
+ // we have to do a workaround because of buggy ubuntu fpm reload handling
+ // @see: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1242376
if(file_exists('/etc/os-release')) {
$tmp = file_get_contents('/etc/os-release');
if(preg_match('/^ID=ubuntu/m', $tmp) && preg_match('/^VERSION_ID="14\.04"/m', $tmp)) {
@@ -245,7 +247,6 @@
unset($tmp);
}
}
-
}
$retval = array('output' => '', 'retval' => 0);
--
Gitblit v1.9.1