Merged revisions 33615 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 12 Jun 2006 15:30:32 +0000 (15:30 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 12 Jun 2006 15:30:32 +0000 (15:30 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r33615 | tilghman | 2006-06-12 10:27:18 -0500 (Mon, 12 Jun 2006) | 4 lines

Move set priority up, because at this point in the code, stdout is no longer
the console.  If we're unable to set priority, the error goes to Asterisk as
if it were an AGI command (issue 7335).

........

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

res/res_agi.c

index 1d6cd92..62ecea5 100644 (file)
@@ -305,6 +305,9 @@ static enum agi_result launch_script(char *script, char *argv[], int *fds, int *
                setenv("AST_KEY_DIR", ast_config_AST_KEY_DIR, 1);
                setenv("AST_RUN_DIR", ast_config_AST_RUN_DIR, 1);
 
+               /* Don't run AGI scripts with realtime priority -- it causes audio stutter */
+               ast_set_priority(0);
+
                /* Redirect stdin and out, provide enhanced audio channel if desired */
                dup2(fromast[0], STDIN_FILENO);
                dup2(toast[1], STDOUT_FILENO);
@@ -324,9 +327,6 @@ static enum agi_result launch_script(char *script, char *argv[], int *fds, int *
                for (x=STDERR_FILENO + 2;x<1024;x++) 
                        close(x);
 
-               /* Don't run AGI scripts with realtime priority -- it causes audio stutter */
-               ast_set_priority(0);
-
                /* Execute script */
                execv(script, argv);
                /* Can't use ast_log since FD's are closed */