GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber
2010-03-18 17:19:28 -07:00
parent 9c5af9a38f 01a1e882af
commit 3e2e88b0df
14 changed files with 236 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/xmppdaemon.php
View File

@@ -98,7 +98,15 @@ class XmppMaster extends IoMaster
// don't have to find an XMPP site to start up when using --all mode.
if (common_config('xmpp','enabled')==false) {
print "Aborting daemon - xmpp is disabled\n";
exit();
exit(1);
}
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')) {