Merged revisions 220288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r220288 | tilghman | 2009-09-24 14:39:41 -0500 (Thu, 24 Sep 2009) | 6 lines Implicitly sending a progress signal breaks some applications. Call Progress() in your dialplan if you explicitly want progress to be sent. (Reverts change 216430, closes issue #15957) Reported by: Pavel Troller on the Asterisk-Dev mailing list http://lists.digium.com/pipermail/asterisk-dev/2009-September/039897.html ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@220289 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
5a0480ef21
commit
a0a179b39a
|
@ -187,12 +187,7 @@ static int disa_exec(struct ast_channel *chan, const char *data)
|
|||
/* answer */
|
||||
ast_answer(chan);
|
||||
}
|
||||
} else {
|
||||
special_noanswer = 1;
|
||||
if (chan->_state != AST_STATE_UP) {
|
||||
ast_indicate(chan, AST_CONTROL_PROGRESS);
|
||||
}
|
||||
}
|
||||
} else special_noanswer = 1;
|
||||
|
||||
ast_debug(1, "Context: %s\n",args.context);
|
||||
|
||||
|
|
|
@ -452,10 +452,7 @@ static int playback_exec(struct ast_channel *chan, const char *data)
|
|||
} else if (!option_noanswer) {
|
||||
/* Otherwise answer unless we're supposed to send this while on-hook */
|
||||
res = ast_answer(chan);
|
||||
} else {
|
||||
ast_indicate(chan, AST_CONTROL_PROGRESS);
|
||||
}
|
||||
|
||||
}
|
||||
if (!res) {
|
||||
char *back = args.filenames;
|
||||
|
|
|
@ -9126,8 +9126,6 @@ static int pbx_builtin_background(struct ast_channel *chan, const char *data)
|
|||
} else if (!ast_test_flag(&flags, BACKGROUND_NOANSWER)) {
|
||||
res = ast_answer(chan);
|
||||
}
|
||||
/* Send progress control frame to start early media */
|
||||
ast_indicate(chan, AST_CONTROL_PROGRESS);
|
||||
}
|
||||
|
||||
if (!res) {
|
||||
|
|
Reference in New Issue