Merged revisions 156164 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 12 Nov 2008 17:38:20 +0000 (17:38 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 12 Nov 2008 17:38:20 +0000 (17:38 +0000)
commite2133648f9e8adb5c9ae8c0397678287cba3423b
tree0a037ef40892f659f6fa6b2c98ad4efcda6be7e6
parent15d30a56cd8fafac23e58f117fbdf65d2f1b0281
Merged revisions 156164 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r156164 | russell | 2008-11-12 11:29:52 -0600 (Wed, 12 Nov 2008) | 7 lines

Move the sanity check that makes sure "always fork" is not set along with the
console option to be after the code that reads options from asterisk.conf.
This resolves a situation where Asterisk can start taking up 100% when
misconfigured.
(Thanks to Bryce Porter (x86 on IRC) for letting me log in to his system to
 figure out what was causing the 100% CPU problem.)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@156166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/asterisk.c