hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 12:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #990 : add check on posix support for pcntl

Browse Source
This commit is contained in:
Romain Neutron
2012-11-05 15:16:33 +01:00
parent b195375614
commit d25bae42a7
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/setup.class.php
View File

@@ -39,6 +39,7 @@ class setup
, 'pcntl' , 'pcntl'
, "PDO" , "PDO"
, "phrasea2" , "phrasea2"
, 'posix'
, "SimpleXML" , "SimpleXML"
, "sockets" , "sockets"
, "xml" , "xml"
@@ -375,7 +376,7 @@ class setup
$constraints = array(); $constraints = array();
foreach (self::$PHP_EXT as $ext) { foreach (self::$PHP_EXT as $ext) {
if ('pcntl' === $ext && 0 === stripos(strtolower(PHP_OS), 'win')) { if (in_array($ext, array('pcntl', 'posix')) && defined('PHP_WINDOWS_VERSION_BUILD')) {
continue; continue;
} }

3
lib/classes/task/Scheduler.class.php
View File

@@ -65,10 +65,9 @@ class task_Scheduler
$nullfile = 'NUL'; $nullfile = 'NUL';
} }
if (function_exists('pcntl_fork')) { if (\task_manager::isPosixPcntlSupported()) {
// avoid <defunct> php when a task ends // avoid <defunct> php when a task ends
pcntl_signal(SIGCHLD, SIG_IGN); pcntl_signal(SIGCHLD, SIG_IGN);
$this->method = self::METHOD_FORK; $this->method = self::METHOD_FORK;
} }

10
lib/classes/task/manager.class.php
View File

@@ -193,6 +193,16 @@ class task_manager
return $ret; return $ret;
} }
/**
* Returns true if Pcntl posix supported is enabled, false otherwise
*
* @return Boolean
*/
public static function isPosixPcntlSupported()
{
return extension_loaded('pcntl') && extension_loaded('posix');
}
public static function getAvailableTasks() public static function getAvailableTasks()
{ {
$taskdir = array( $taskdir = array(