Merged revisions 288339 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r288339 | russell | 2010-09-22 11:39:16 -0500 (Wed, 22 Sep 2010) | 11 lines

  Fix a 100% CPU consumption problem when setting console=yes in asterisk.conf.

  The handling of -c and console=yes should be the same, but they were not.
  When you specify -c, it sets both a flag for console module and for asterisk
  not to fork() off into the background.  The handling of console=yes only set
  console mode, so you would end up with a background process() trying to run
  the Asterisk console and freaking out since it didn't have anything to read
  input from.

  Thanks to beagles for reporting and helping debug the problem!
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@288340 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/asterisk.c b/main/asterisk.c
index d23cc49be6ec24a81f73c8d8ff8fcb15e55d89f2..a4539d13cb3b694b086b2327d272e0474cc5be84 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2933,7 +2933,7 @@ static void ast_readconfig(void)
                        ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_QUIET);
                /* Run as console (-c at startup, implies nofork) */
                } else if (!strcasecmp(v->name, "console")) {
-                       ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_CONSOLE);
+                       ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_NO_FORK | AST_OPT_FLAG_CONSOLE);
                /* Run with high priority if the O/S permits (-p at startup) */
                } else if (!strcasecmp(v->name, "highpriority")) {
                        ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_HIGH_PRIORITY);