diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-24 19:41:02 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-24 19:41:02 +0000 |
commit | a0a179b39a2d8f733a8ae7d2fdc2a0a79a78f2be (patch) | |
tree | 8d179523413797799cac67750d270180828bd112 | |
parent | 5a0480ef21d092fc530cac8d7383d7191ab78eb8 (diff) |
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
-rw-r--r-- | apps/app_disa.c | 7 | ||||
-rw-r--r-- | apps/app_playback.c | 3 | ||||
-rw-r--r-- | main/pbx.c | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/apps/app_disa.c b/apps/app_disa.c index e87ee8357..49c7ad554 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -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); diff --git a/apps/app_playback.c b/apps/app_playback.c index 612cf684c..45fcfb5e4 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -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; diff --git a/main/pbx.c b/main/pbx.c index 9b349da15..0cbaff39f 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -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) { |