diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-24 19:39:41 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-24 19:39:41 +0000 |
| commit | 4351071712c1b7452d2ae58bdf4e6103c642145c (patch) | |
| tree | 5a1628e3986f89dd5133fb1ba6d4363792cffdf4 | |
| parent | 2fb7bdec87a5d58d622f65e06da9491b3c3e35b5 (diff) | |
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/branches/1.4@220288 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 038274057..3c8bad9d4 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -176,12 +176,7 @@ static int disa_exec(struct ast_channel *chan, void *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; i = k = x = 0; /* k is 0 for pswd entry, 1 for ext entry */ did_ignore = 0; exten[0] = 0; diff --git a/apps/app_playback.c b/apps/app_playback.c index 972435f18..0b788e23a 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -421,10 +421,7 @@ static int playback_exec(struct ast_channel *chan, void *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 78abecfae..7cf669c1f 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5710,8 +5710,6 @@ static int pbx_builtin_background(struct ast_channel *chan, void *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) { |