aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-24 19:42:25 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-24 19:42:25 +0000
commitb165c0a8daf60e5719e273005fd4012441caee43 (patch)
treee6f5c87e3b1aa705d5824eb647dc6afe0e8ff48e /main
parentd80f8a1bb98a74546c22f10911478a8e3858887c (diff)
Merged revisions 220289 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r220289 | tilghman | 2009-09-24 14:41:02 -0500 (Thu, 24 Sep 2009) | 13 lines 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/branches/1.6.0@220290 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/pbx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 26a5e3887..9b1388e77 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7917,8 +7917,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) {