Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / scripts / imdaemon.php

diff --git a/scripts/imdaemon.php b/scripts/imdaemon.php
index 0ce74667c5d0178e2aeea7daa7b5f86d0cec3121..7d9ff1fe7dc7d1d65d0007c14e76219e713e196d 100755 (executable)
--- a/scripts/imdaemon.php
+++ b/scripts/imdaemon.php
@@ -33,7 +33,7 @@ Daemon script for receiving new notices from IM users.
 
 END_OF_IM_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 class ImDaemon extends SpawningDaemon
 {
@@ -94,14 +94,6 @@ class ImMaster extends IoMaster
     }
 }
 
-if (version_compare(PHP_VERSION, '5.2.6', '<')) {
-    $arch = php_uname('m');
-    if ($arch == 'x86_64' || $arch == 'amd64') {
-        print "Aborting daemon - 64-bit PHP prior to 5.2.6 has known bugs in stream_select; you are running " . PHP_VERSION . " on $arch.\n";
-        exit(1);
-    }
-}
-
 if (have_option('i', 'id')) {
     $id = get_option_value('i', 'id');
 } else if (count($args) > 0) {