diff options
author | Evan Prodromou <evan@status.net> | 2010-03-18 15:21:43 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-03-18 15:21:43 -0500 |
commit | dbd44e51a2a9c5c63a6211002e5dd3b14483fb60 (patch) | |
tree | 56344401c6a541eca0b45ec01201faa9c52ce3f9 /scripts/xmppdaemon.php | |
parent | 2ccd5187ccd509f3f579629186a7087720e5f94a (diff) | |
parent | f1b3d84b7d55cc7c466982a95815ba1ddf130418 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'scripts/xmppdaemon.php')
-rwxr-xr-x | scripts/xmppdaemon.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php index 26c7991b8..abd7cc22b 100755 --- a/scripts/xmppdaemon.php +++ b/scripts/xmppdaemon.php @@ -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')) { |