Merge branch 'master' of github.com:kakserpom/phpdaemon

bin/ircbot

@@ -1,4 +1,4 @@
-#!/opt/bin/php -q
+#!/usr/bin/env php
 <?php
 $filename = 'phpd-ircbot.conf';
 $configFile = '/etc/phpdaemon/' .$filename . '.conf;/etc/phpd/' .$filename . ';./conf/' .$filename;

bin/php-chroot

@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 /* 

bin/phpd

@@ -1,4 +1,4 @@
-#!/opt/bin/php -q
+#!/usr/bin/env php
 <?php
 
 /**************************************************************************/

bin/sampleapp

@@ -1,4 +1,4 @@
-#!/usr/bin/php -q
+#!/usr/bin/env php
 <?php
 $filename = 'phpd-sampleapp.conf';
 $configFile = '/etc/phpdaemon/' .$filename . '.conf;/etc/phpd/' .$filename . ';./conf/' .$filename;

lib/Daemon_Bootstrap.php

@@ -66,6 +66,11 @@ class Daemon_Bootstrap {
 	 * @return void
 	 */
 	public static function init($configFile = null) {
+		if (version_compare(PHP_VERSION, '5.4.0', '>=') === 1) {
+			Daemon::log('PHP >= 5.4.0 required.');
+			$error = true;
+			return;
+		}
 		Daemon::initSettings();
 		FS::init();
 		Daemon::$runName = basename($_SERVER['argv'][0]);
@@ -110,15 +115,11 @@ public static function init($configFile = null) {
 		if (!Daemon::$config->loadCmdLineArgs($args)) {
 			$error = true;
 		}
-		
+
 		if (!Daemon::loadConfig(Daemon::$config->configfile->value)) {
 			$error = true;
 		}
 
-		if (version_compare(PHP_VERSION, '5.4.0', '>=') === 1) {
-			Daemon::log('PHP >= 5.4.0 required.');
-			$error = true;
-		}
 
 		if ('log' === $runmode) {
 			passthru('tail -n '.$n.' -f '.escapeshellarg(Daemon::$config->logstorage->value));

lib/Thread.php

@@ -51,7 +51,7 @@ abstract class Thread {
 		SIGILL    => 'SIGILL',
 //		SIGTRAP   => 'SIGTRAP',
 //		SIGABRT   => 'SIGABRT',
-		7         => 'SIGEMT',
+//		7         => 'SIGEMT',
 		SIGFPE    => 'SIGFPE',
 		SIGBUS    => 'SIGBUS',
 		SIGSYS    => 'SIGSYS',